Changes in uspace/app/taskdump/taskdump.c [e3a3a619:6a343bdf] in mainline

File:

• uspace/app/taskdump/taskdump.c (modified) (13 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>
@@ -85 +85 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
+                printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;
         }
@@ -92 +92 @@
         app_symtab = NULL;
 
-        printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id);
+        printf("Dumping task '%s' (task ID %" PRIu64 ").\n", app_name, task_id);
         autoload_syms();
         putchar('\n');
@@ -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(%" PRIdTASKID ") -> %d ", task_id, rc);
+                printf("async_connect_kbox(%" PRIu64 ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -168 +168 @@
                                 core_file_name = *argv;
                         } else {
-                                printf("Uknown option '%s'\n", arg[0]);
+                                printf("Uknown option '%c'\n", arg[0]);
                                 print_syntax();
                                 return -1;
@@ -240 +240 @@
         printf("Threads:\n");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] hash: %p\n", 1+i, thash_buf[i]);
+                printf(" [%zu] hash: %p\n", 1 + i, (void *) thash_buf[i]);
 
                 thread_dump(thash_buf[i]);
@@ -284 +284 @@
         printf("Address space areas:\n");
         for (i = 0; i < n_areas; i++) {
-                printf(" [%d] flags: %c%c%c%c base: %p size: %p\n", 1+i,
+                printf(" [%zu] flags: %c%c%c%c base: %p size: %zu\n", 1 + i,
                     (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-',
                     (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-',
                     (ainfo_buf[i].flags & AS_AREA_EXEC) ? 'X' : '-',
                     (ainfo_buf[i].flags & AS_AREA_CACHEABLE) ? 'C' : '-',
-                    ainfo_buf[i].start_addr, ainfo_buf[i].size);
+                    (void *) ainfo_buf[i].start_addr, ainfo_buf[i].size);
         }
 
@@ -326 +326 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread %p crashed at %s. FP = %p\n", thash, sym_pc, fp);
+        printf("Thread %p: PC = %s. FP = %p\n", (void *) thash,
+            sym_pc, (void *) fp);
         free(sym_pc);
 
@@ -334 +335 @@
         while (stacktrace_fp_valid(&st, fp)) {
                 sym_pc = fmt_sym_address(pc);
-                printf("  %p: %s\n", fp, sym_pc);
+                printf("  %p: %s\n", (void *) fp, sym_pc);
                 free(sym_pc);
 
@@ -393 +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");
@@ -457 +471 @@
 
         if (rc == EOK) {
-                rc = asprintf(&str, "%p (%s+%p)", addr, name, offs);
+                rc = asprintf(&str, "%p (%s+%zu)", (void *) addr, name, offs);
         } else {
-                rc = asprintf(&str, "%p", addr);
+                rc = asprintf(&str, "%p", (void *) addr);
         }