Changeset ad7a6c9 in mainline for uspace/app/taskdump/taskdump.c

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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) (6 diffs)

uspace/app/taskdump/taskdump.c

@@ -33 +33 @@
  */
 
+#include <async.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <ipc/ipc.h>
 #include <errno.h>
 #include <udebug.h>
@@ -105 +105 @@
 
         udebug_end(phoneid);
-        ipc_hangup(phoneid);
+        async_hangup(phoneid);
 
         return 0;
@@ -114 +114 @@
         int rc;
 
-        rc = ipc_connect_kbox(task_id);
+        rc = async_connect_kbox(task_id);
 
         if (rc == ENOTSUP) {
@@ -126 +126 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc);
+                printf("async_connect_kbox(%" PRIu64 ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -326 +326 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread %p crashed at %s. FP = %p\n", (void *) thash,
+        printf("Thread %p: PC = %s. FP = %p\n", (void *) thash,
             sym_pc, (void *) fp);
         free(sym_pc);
@@ -394 +394 @@
 
         rc = asprintf(&file_name, "/srv/%s", app_name);
+        if (rc < 0) {
+                printf("Memory allocation failure.\n");
+                exit(1);
+        }
+
+        rc = symtab_load(file_name, &app_symtab);
+        if (rc == EOK) {
+                printf("Loaded symbol table from %s\n", file_name);
+                free(file_name);
+                return;
+        }
+
+        rc = asprintf(&file_name, "/drv/%s/%s", app_name, app_name);
         if (rc < 0) {
                 printf("Memory allocation failure.\n");