Changeset 95e6c4f in mainline for uspace/srv/taskmon/taskmon.c

Timestamp:

2010-01-27T20:21:49Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a9bbe48d, b79d450

Parents:

bca408b (diff), f0bdfb7 (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 small taskdump improvements.

File:

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

uspace/srv/taskmon/taskmon.c

@@ -72 +72 @@
         printf(NAME ": Task %lld fault in thread 0x%lx.\n", taskid, thread);
 
-        argv[0] = fname = "/app/redir";
+#ifdef CONFIG_VERBOSE_DUMPS
+        argv[0] = "/app/redir";
         argv[1] = "-i";
         argv[2] = "/readme";
@@ -78 +79 @@
         argv[4] = dump_fname;
         argv[5] = "--";
-
-#ifdef CONFIG_VERBOSE_DUMPS
         argv[6] = "/app/taskdump";
         argv[7] = "-m";
@@ -86 +85 @@
         argv[10] = NULL;
 #else
-        argv[6] = "/app/taskdump";
-        argv[7] = "-t";
-        argv[8] = s_taskid;
-        argv[9] = NULL;
+        argv[0] = "/app/taskdump";
+        argv[1] = "-t";
+        argv[2] = s_taskid;
+        argv[3] = NULL;
 #endif
+        fname = argv[0];
+
         printf(NAME ": Executing");
         s = argv;