Changeset 03333bc in mainline

Timestamp:

2010-01-23T20:08:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bc310a05

Parents:

a074b4f

Message:

Save dumps in files under /scratch.

Location:

uspace

Files:

• app/init/init.c (modified) (3 diffs)
• srv/taskmon/taskmon.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -233 +233 @@
 }
 
+static void mount_scratch(void)
+{
+        int rc;
+
+        printf("Trying to mount null/0 on /scratch... ");
+        fflush(stdout);
+
+        rc = mount("tmpfs", "/scratch", "null/0", "", 0);
+        if (rc == EOK)
+                printf("OK\n");
+        else
+                printf("Failed\n");
+}
+
 static void mount_data(void)
 {
@@ -255 +269 @@
                 return -1;
         }
+
+        /* Make sure tmpfs is running. */
+        if (str_cmp(STRING(RDFMT), "tmpfs") != 0) {
+                spawn("/srv/tmpfs");
+        }
         
         spawn("/srv/devfs");
@@ -263 +282 @@
                 return -2;
         }
+
+        mount_scratch();
         
         spawn("/srv/fhc");

uspace/srv/taskmon/taskmon.c

@@ -48 +48 @@
 static void fault_event(ipc_callid_t callid, ipc_call_t *call)
 {
-        char *argv[5];
+        char *argv[11];
         char *fname;
+        char *dump_fname;
         char *s_taskid;
+        char **s;
 
         task_id_t taskid;
@@ -63 +65 @@
         }
 
+        if (asprintf(&dump_fname, "/scratch/d%lld.txt", taskid) < 0) {
+                printf("Memory allocation failed.\n");
+                return;
+        }
+
         printf(NAME ": Task %lld fault in thread 0x%lx.\n", taskid, thread);
 
-        argv[0] = fname = "/app/taskdump";
+        argv[0] = fname = "/app/redir";
+        argv[1] = "-i";
+        argv[2] = "/readme";
+        argv[3] = "-o";
+        argv[4] = dump_fname;
+        argv[5] = "--";
 
 #ifdef CONFIG_VERBOSE_DUMPS
-        argv[1] = "-m";
-        argv[2] = "-t";
-        argv[3] = s_taskid;
-        argv[4] = NULL;
-
-        printf(NAME ": Executing %s %s %s %s\n", argv[0], argv[1], argv[2],
-            argv[3]);
+        argv[6] = "/app/taskdump";
+        argv[7] = "-m";
+        argv[8] = "-t";
+        argv[9] = s_taskid;
+        argv[10] = NULL;
 #else
-        argv[1] = "-t";
-        argv[2] = s_taskid;
-        argv[3] = NULL;
-
-        printf(NAME ": Executing %s %s %s\n", argv[0], argv[1], argv[2]);
+        argv[6] = "/app/taskdump";
+        argv[7] = "-t";
+        argv[8] = s_taskid;
+        argv[9] = NULL;
 #endif
+        printf(NAME ": Executing");
+        s = argv;
+        while (*s != NULL) {
+                printf(" %s", *s);
+                ++s;
+        }
+        putchar('\n');
 
         if (!task_spawn(fname, argv))