Changeset 9fd39d6 in mainline for uspace/srv

Timestamp:

2010-11-07T19:15:39Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

16ac756

Parents:

68f0c3a (diff), 3da12d74 (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.

Location:

uspace/srv

Files:

• devman/devman.c (modified) (2 diffs)
• taskmon/taskmon.c (modified) (3 diffs)

uspace/srv/devman/devman.c

@@ -37 +37 @@
 #include <ipc/devman.h>
 #include <devmap.h>
+#include <str_error.h>
 
 #include "devman.h"
@@ -446 +447 @@
 bool start_driver(driver_t *drv)
 {
+        int rc;
+
         printf(NAME ": start_driver '%s'\n", drv->name);
         
-        const char *argv[2];
-        
-        argv[0] = drv->name;
-        argv[1] = NULL;
-        
-        int err;
-        if (task_spawn(drv->binary_path, argv, &err) == 0) {
-                printf(NAME ": error spawning %s, errno = %d\n",
-                    drv->name, err);
+        rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL);
+        if (rc != EOK) {
+                printf(NAME ": error spawning %s (%s)\n",
+                    drv->name, str_error(rc));
                 return false;
         }

uspace/srv/taskmon/taskmon.c

@@ -50 +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;
-        const char **s;
+        int rc;
 
         task_id_t taskid;
@@ -67 +65 @@
         }
 
+        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
+
+        fname = "/app/taskdump";
+
+#ifdef CONFIG_WRITE_CORE_FILES
+        char *dump_fname;
+
         if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
@@ -72 +77 @@
         }
 
-        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", 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", 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');
-        
-        int err;
-        if (!task_spawn(fname, argv, &err))
-                printf("%s: Error spawning %s (%s).\n", NAME, fname,
-                    str_error(err));
 }