Changeset 46c20c8 in mainline for uspace/srv/taskmon/taskmon.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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) (3 diffs)

uspace/srv/taskmon/taskmon.c

@@ -44 +44 @@
 #include <macros.h>
 #include <errno.h>
+#include <str_error.h>
 
 #define NAME  "taskmon"
@@ -49 +50 @@
 static void fault_event(ipc_callid_t callid, ipc_call_t *call)
 {
-        char *argv[6];
-        char *fname;
-        char *dump_fname;
+        const char *fname;
         char *s_taskid;
-        char **s;
+        int rc;
 
         task_id_t taskid;
@@ -61 +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;
         }
 
-        if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
+        printf(NAME ": Task %" PRIu64 " fault in thread %p.\n", taskid,
+            (void *) thread);
+
+        fname = "/app/taskdump";
+
+#ifdef CONFIG_WRITE_CORE_FILES
+        char *dump_fname;
+
+        if (asprintf(&dump_fname, "/data/core%" PRIu64, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
-
-#ifdef CONFIG_WRITE_CORE_FILES
-        argv[0] = "/app/taskdump";
-        argv[1] = "-c";
-        argv[2] = dump_fname;
-        argv[3] = "-t";
-        argv[4] = s_taskid;
-        argv[5] = NULL;
+        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
-        argv[0] = "/app/taskdump";
-        argv[1] = "-t";
-        argv[2] = s_taskid;
-        argv[3] = NULL;
+        printf(NAME ": Executing %s -t %s\n", fname, s_taskid);
+        rc = task_spawnl(NULL, fname, fname, "-t", s_taskid, NULL);
 #endif
-        fname = argv[0];
-
-        printf(NAME ": Executing");
-        s = argv;
-        while (*s != NULL) {
-                printf(" %s", *s);
-                ++s;
+        if (rc != EOK) {
+                printf("%s: Error spawning %s (%s).\n", NAME, fname,
+                    str_error(rc));
         }
-        putchar('\n');
-
-        if (!task_spawn(fname, argv))
-                printf(NAME ": Error spawning taskdump.\n", fname);
 }