Changeset 1affcdf3 in mainline for uspace/app/taskdump/taskdump.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/taskdump/taskdump.c (modified) (12 diffs)

uspace/app/taskdump/taskdump.c

@@ -54 +54 @@
 #define LINE_BYTES 16
 
-static int phoneid;
+static async_sess_t *sess;
 static task_id_t task_id;
 static bool write_core_file;
@@ -104 +104 @@
                 printf("Failed dumping address space areas.\n");
 
-        udebug_end(phoneid);
-        async_hangup(phoneid);
+        udebug_end(sess);
+        async_hangup(sess);
 
         return 0;
@@ -112 +112 @@
 static int connect_task(task_id_t task_id)
 {
-        int rc;
-
-        rc = async_connect_kbox(task_id);
-
-        if (rc == ENOTSUP) {
-                printf("You do not have userspace debugging support "
-                    "compiled in the kernel.\n");
-                printf("Compile kernel with 'Support for userspace debuggers' "
-                    "(CONFIG_UDEBUG) enabled.\n");
-                return rc;
-        }
-
-        if (rc < 0) {
+        async_sess_t *ksess = async_connect_kbox(task_id);
+        
+        if (!ksess) {
+                if (errno == ENOTSUP) {
+                        printf("You do not have userspace debugging support "
+                            "compiled in the kernel.\n");
+                        printf("Compile kernel with 'Support for userspace debuggers' "
+                            "(CONFIG_UDEBUG) enabled.\n");
+                        return errno;
+                }
+                
                 printf("Error connecting\n");
-                printf("async_connect_kbox(%" PRIu64 ") -> %d ", task_id, rc);
-                return rc;
-        }
-
-        phoneid = rc;
-
-        rc = udebug_begin(phoneid);
+                printf("async_connect_kbox(%" PRIu64 ") -> %d ", task_id, errno);
+                return errno;
+        }
+        
+        int rc = udebug_begin(ksess);
         if (rc < 0) {
                 printf("udebug_begin() -> %d\n", rc);
                 return rc;
         }
-
+        
+        sess = ksess;
         return 0;
 }
@@ -213 +210 @@
 
         /* TODO: See why NULL does not work. */
-        rc = udebug_thread_read(phoneid, &dummy_buf, 0, &copied, &needed);
+        rc = udebug_thread_read(sess, &dummy_buf, 0, &copied, &needed);
         if (rc < 0) {
                 printf("udebug_thread_read() -> %d\n", rc);
@@ -227 +224 @@
         thash_buf = malloc(buf_size);
 
-        rc = udebug_thread_read(phoneid, thash_buf, buf_size, &copied, &needed);
+        rc = udebug_thread_read(sess, thash_buf, buf_size, &copied, &needed);
         if (rc < 0) {
                 printf("udebug_thread_read() -> %d\n", rc);
@@ -262 +259 @@
         int rc;
 
-        rc = udebug_areas_read(phoneid, &dummy_buf, 0, &copied, &needed);
+        rc = udebug_areas_read(sess, &dummy_buf, 0, &copied, &needed);
         if (rc < 0) {
                 printf("udebug_areas_read() -> %d\n", rc);
@@ -271 +268 @@
         ainfo_buf = malloc(buf_size);
 
-        rc = udebug_areas_read(phoneid, ainfo_buf, buf_size, &copied, &needed);
+        rc = udebug_areas_read(sess, ainfo_buf, buf_size, &copied, &needed);
         if (rc < 0) {
                 printf("udebug_areas_read() -> %d\n", rc);
@@ -296 +293 @@
         if (write_core_file) {
                 printf("Writing core file '%s'\n", core_file_name);
-                rc = elf_core_save(core_file_name, ainfo_buf, n_areas, phoneid);
+                rc = elf_core_save(core_file_name, ainfo_buf, n_areas, sess);
                 if (rc != EOK) {
                         printf("Failed writing core file.\n");
@@ -316 +313 @@
         int rc;
 
-        rc = udebug_regs_read(phoneid, thash, &istate);
+        rc = udebug_regs_read(sess, thash, &istate);
         if (rc < 0) {
                 printf("Failed reading registers (%d).\n", rc);
@@ -359 +356 @@
         (void) arg;
 
-        rc = udebug_mem_read(phoneid, &data, addr, sizeof(data));
+        rc = udebug_mem_read(sess, &data, addr, sizeof(data));
         if (rc < 0) {
                 printf("Warning: udebug_mem_read() failed.\n");
@@ -430 +427 @@
         int rc;
 
-        rc = udebug_name_read(phoneid, &dummy_buf, 0, &copied, &needed);
+        rc = udebug_name_read(sess, &dummy_buf, 0, &copied, &needed);
         if (rc < 0)
                 return NULL;
@@ -436 +433 @@
         name_size = needed;
         name = malloc(name_size + 1);
-        rc = udebug_name_read(phoneid, name, name_size, &copied, &needed);
+        rc = udebug_name_read(sess, name, name_size, &copied, &needed);
         if (rc < 0) {
                 free(name);