Changeset 19f24fd in mainline for uspace/app/taskdump/taskdump.c

Timestamp:

2010-02-05T22:25:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (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) (7 diffs)

uspace/app/taskdump/taskdump.c

@@ -41 +41 @@
 #include <task.h>
 #include <kernel/mm/as.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
 #include <libarch/istate.h>
 #include <macros.h>
@@ -93 +95 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %lld.\n", task_id);
+                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
                 return 1;
         }
@@ -100 +102 @@
         app_symtab = NULL;
 
-        printf("Dumping task '%s' (task ID %lld).\n", app_name, task_id);
+        printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id);
         autoload_syms();
         putchar('\n');
@@ -134 +136 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -245 +247 @@
         printf("Threads:\n");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] hash: 0x%lx\n", 1+i, thash_buf[i]);
+                printf(" [%d] hash: %p\n", 1+i, thash_buf[i]);
 
                 thread_dump(thash_buf[i]);
@@ -289 +291 @@
         printf("Address space areas:\n");
         for (i = 0; i < n_areas; i++) {
-                printf(" [%d] flags: %c%c%c%c base: 0x%lx size: 0x%lx\n", 1+i,
+                printf(" [%d] flags: %c%c%c%c base: %p size: %p\n", 1+i,
                     (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-',
                     (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-',
@@ -328 +330 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread 0x%lx crashed at %s. FP = 0x%lx\n", thash, sym_pc, fp);
+        printf("Thread %p crashed at %s. FP = %p\n", thash, sym_pc, fp);
         free(sym_pc);