Changeset 15d0046 in mainline for uspace/app/init/init.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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

File:

• uspace/app/init/init.c (modified) (7 diffs)

uspace/app/init/init.c

@@ -172 +172 @@
         va_start(ap, path);
         task_id_t id;
-        int rc = task_spawn(&id, path, cnt, ap);
+        task_wait_t wait;
+        int rc = task_spawn(&id, &wait, path, cnt, ap);
         va_end(ap);
         
@@ -189 +190 @@
         task_exit_t texit;
         int retval;
-        rc = task_wait(id, &texit, &retval);
+        rc = task_wait(&wait, &texit, &retval);
         if (rc != EOK) {
                 printf("%s: Error waiting for %s (%s)\n", NAME, path,
@@ -253 +254 @@
         
         task_id_t id;
-        int rc = task_spawnl(&id, app, app, winreg, NULL);
+        task_wait_t wait;
+        int rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
         if (rc != EOK) {
                 printf("%s: Error spawning %s %s (%s)\n", NAME, app,
@@ -262 +264 @@
         task_exit_t texit;
         int retval;
-        rc = task_wait(id, &texit, &retval);
+        rc = task_wait(&wait, &texit, &retval);
         if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
                 printf("%s: Error retrieving retval from %s (%s)\n", NAME,
@@ -272 +274 @@
 }
 
-static void getterm(const char *svc, const char *app, bool wmsg)
-{
-        char term[LOC_NAME_MAXLEN];
-        snprintf(term, LOC_NAME_MAXLEN, "%s/%s", LOCFS_MOUNT_POINT, svc);
-        
-        printf("%s: Spawning %s %s %s\n", NAME, APP_GETTERM, term, app);
-        
-        /* Wait for the terminal service to be ready */
-        service_id_t service_id;
-        int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Error waiting on %s (%s)\n", NAME, term,
-                    str_error(rc));
-                return;
-        }
-        
-        if (wmsg) {
-                rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, "-w", term,
-                    app, NULL);
-                if (rc != EOK) {
-                        printf("%s: Error spawning %s -w %s %s (%s)\n", NAME,
-                            APP_GETTERM, term, app, str_error(rc));
-                }
+static void getterm(const char *svc, const char *app, bool msg)
+{
+        if (msg) {
+                printf("%s: Spawning %s %s %s --msg --wait -- %s\n", NAME,
+                    APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
+                
+                int rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
+                    LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
+                if (rc != EOK)
+                        printf("%s: Error spawning %s %s %s --msg --wait -- %s\n",
+                            NAME, APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
         } else {
-                rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, term, app,
-                    NULL);
-                if (rc != EOK) {
-                        printf("%s: Error spawning %s %s %s (%s)\n", NAME,
-                            APP_GETTERM, term, app, str_error(rc));
-                }
+                printf("%s: Spawning %s %s %s --wait -- %s\n", NAME,
+                    APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
+                
+                int rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
+                    LOCFS_MOUNT_POINT, "--wait", "--", app, NULL);
+                if (rc != EOK)
+                        printf("%s: Error spawning %s %s %s --wait -- %s\n",
+                            NAME, APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
         }
 }
@@ -339 +331 @@
         srv_start("/srv/apic");
         srv_start("/srv/i8259");
+        srv_start("/srv/icp-ic");
         srv_start("/srv/obio");
         srv_start("/srv/cuda_adb");
@@ -364 +357 @@
                 gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
                 gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
-        } else {
-                rc = console(HID_INPUT, HID_OUTPUT);
-                if (rc == EOK) {
-                        getterm("term/vc0", "/app/bdsh", true);
-                        getterm("term/vc1", "/app/bdsh", false);
-                        getterm("term/vc2", "/app/bdsh", false);
-                        getterm("term/vc3", "/app/bdsh", false);
-                        getterm("term/vc4", "/app/bdsh", false);
-                        getterm("term/vc5", "/app/bdsh", false);
-                        getterm("term/vc6", "/app/klog", false);
-                }
+        }
+        
+        rc = console(HID_INPUT, HID_OUTPUT);
+        if (rc == EOK) {
+                getterm("term/vc0", "/app/bdsh", true);
+                getterm("term/vc1", "/app/bdsh", false);
+                getterm("term/vc2", "/app/bdsh", false);
+                getterm("term/vc3", "/app/bdsh", false);
+                getterm("term/vc4", "/app/bdsh", false);
+                getterm("term/vc5", "/app/bdsh", false);
         }