Changeset c47e1a8 in mainline for uspace/srv/taskmon/taskmon.c

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• uspace/srv/taskmon/taskmon.c (modified) (6 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[11];
-        char *fname;
+        const char *argv[6];
+        const char *fname;
         char *dump_fname;
         char *s_taskid;
-        char **s;
+        const char **s;
 
         task_id_t taskid;
@@ -66 +67 @@
         }
 
-        if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) {
+        if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
@@ -73 +74 @@
         printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
 
-#ifdef CONFIG_VERBOSE_DUMPS
-        argv[0] = "/app/redir";
-        argv[1] = "-i";
-        argv[2] = "/readme";
-        argv[3] = "-o";
-        argv[4] = dump_fname;
-        argv[5] = "--";
-        argv[6] = "/app/taskdump";
-        argv[7] = "-m";
-        argv[8] = "-t";
-        argv[9] = s_taskid;
-        argv[10] = NULL;
+#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
         argv[0] = "/app/taskdump";
@@ -94 +90 @@
 
         printf(NAME ": Executing");
-        s = argv;
+        
+        s = argv;
         while (*s != NULL) {
                 printf(" %s", *s);
@@ -100 +97 @@
         }
         putchar('\n');
-
-        if (!task_spawn(fname, argv))
-                printf(NAME ": Error spawning taskdump.\n", fname);
+        
+        int err;
+        if (!task_spawn(fname, argv, &err))
+                printf("%s: Error spawning %s (%s).\n", NAME, fname,
+                    str_error(err));
 }