Changes in uspace/srv/taskmon/taskmon.c [ffa2c8ef:d9fae235] in mainline

File:

• uspace/srv/taskmon/taskmon.c (modified) (3 diffs)

uspace/srv/taskmon/taskmon.c

@@ -36 +36 @@
 
 #include <stdio.h>
+#include <ipc/ipc.h>
 #include <async.h>
 #include <ipc/services.h>
@@ -49 +50 @@
 static void fault_event(ipc_callid_t callid, ipc_call_t *call)
 {
+        const char *argv[6];
         const char *fname;
+        char *dump_fname;
         char *s_taskid;
-        int rc;
+        const char **s;
 
         task_id_t taskid;
@@ -59 +62 @@
         thread = IPC_GET_ARG3(*call);
 
-        if (asprintf(&s_taskid, "%" PRIu64, taskid) < 0) {
+        if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        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) {
+        if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        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);
+        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;
 #else
-        printf(NAME ": Executing %s -t %s\n", fname, s_taskid);
-        rc = task_spawnl(NULL, fname, fname, "-t", s_taskid, NULL);
+        argv[0] = "/app/taskdump";
+        argv[1] = "-t";
+        argv[2] = s_taskid;
+        argv[3] = NULL;
 #endif
-        if (rc != EOK) {
+        fname = argv[0];
+
+        printf(NAME ": Executing");
+        
+        s = argv;
+        while (*s != NULL) {
+                printf(" %s", *s);
+                ++s;
+        }
+        putchar('\n');
+        
+        int err;
+        if (!task_spawn(fname, argv, &err))
                 printf("%s: Error spawning %s (%s).\n", NAME, fname,
-                    str_error(rc));
-        }
+                    str_error(err));
 }