Changeset 95bc57c in mainline for uspace/app/init/init.c

Timestamp:

2009-07-06T20:55:07Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

1757ffce

Parents:

adb49f58

Message:

Servers can return value as soon as they are up. Use this with block-device drivers to start them synchronously. Eliminate ad-hoc sleeping.

File:

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

uspace/app/init/init.c

@@ -137 +137 @@
 }
 
+static void srv_start(char *fname)
+{
+        char *argv[2];
+        task_id_t id;
+        task_exit_t texit;
+        int rc, retval;
+        
+        printf(NAME ": Starting %s\n", fname);
+        
+        argv[0] = fname;
+        argv[1] = NULL;
+        
+        id = task_spawn(fname, argv);
+        if (!id) {
+                printf(NAME ": Error spawning %s\n", fname);
+                return;
+        }
+
+        rc = task_wait(id, &texit, &retval);
+        if (rc != EOK) {
+                printf(NAME ": Error waiting for %s\n", fname);
+                return;
+        }
+
+        if (texit != TASK_EXIT_NORMAL || retval != 0) {
+                printf(NAME ": Server %s failed to start (returned %d)\n",
+                        fname, retval);
+        }
+}
+
 static void getvc(char *dev, char *app)
 {
@@ -198 +228 @@
         spawn("/srv/fhc");
         spawn("/srv/obio");
-        spawn("/srv/ata_bd");
-        spawn("/srv/gxe_bd");
-        
-        usleep(250000); // FIXME
+
+        /*
+         * Start these synchronously so that mount_data() can be
+         * non-blocking.
+         */
+        srv_start("/srv/ata_bd");
+        srv_start("/srv/gxe_bd");
+        
         mount_data();