Changeset 973ef9fc in mainline for uspace/srv/taskmon/taskmon.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/srv/taskmon/taskmon.c (modified) (2 diffs)

uspace/srv/taskmon/taskmon.c

@@ -60 +60 @@
         thread = IPC_GET_ARG3(*call);
 
-        if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) {
+        if (asprintf(&s_taskid, "%" PRIu64, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
+        printf(NAME ": Task %" PRIu64 " fault in thread %p.\n", taskid,
+            (void *) thread);
 
         fname = "/app/taskdump";
@@ -72 +73 @@
         char *dump_fname;
 
-        if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
+        if (asprintf(&dump_fname, "/data/core%" PRIu64, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Executing %s -c %s -t %s\n", dump_fname, s_taskid);
+        printf(NAME ": Executing %s -c %s -t %s\n", fname, dump_fname, s_taskid);
         rc = task_spawnl(NULL, fname, fname, "-c", dump_fname, "-t", s_taskid,
             NULL);
 #else
-        printf(NAME ": Executing %s -t %s\n", s_taskid);
+        printf(NAME ": Executing %s -t %s\n", fname, s_taskid);
         rc = task_spawnl(NULL, fname, fname, "-t", s_taskid, NULL);
 #endif