Changes in uspace/app/init/init.c [73d8600:31e9fe0] in mainline

File:

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

uspace/app/init/init.c

@@ -49 +49 @@
 #include <loc.h>
 #include <str_error.h>
-#include <config.h>
 #include "init.h"
 
@@ -60 +59 @@
 #define TMPFS_FS_TYPE      "tmpfs"
 #define TMPFS_MOUNT_POINT  "/tmp"
+
+#define DATA_FS_TYPE      "fat"
+#define DATA_DEVICE       "bd/ata1disk0"
+#define DATA_MOUNT_POINT  "/data"
 
 #define SRV_CONSOLE  "/srv/console"
@@ -127 +130 @@
                 opts = "restore";
         
-        int rc = vfs_mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
+        int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
             IPC_FLAG_BLOCKING, 0);
         return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
@@ -144 +147 @@
 static bool mount_locfs(void)
 {
-        int rc = vfs_mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
+        int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
             IPC_FLAG_BLOCKING, 0);
         return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
@@ -153 +156 @@
 {
         struct stat s;
-        if (stat(path, &s) != 0) {
+        if (stat(path, &s) == ENOENT) {
                 printf("%s: Unable to stat %s\n", NAME, path);
                 return ENOENT;
@@ -173 +176 @@
         va_start(ap, path);
         task_id_t id;
-        task_wait_t wait;
-        int rc = task_spawn(&id, &wait, path, cnt, ap);
+        int rc = task_spawn(&id, path, cnt, ap);
         va_end(ap);
         
@@ -191 +193 @@
         task_exit_t texit;
         int retval;
-        rc = task_wait(&wait, &texit, &retval);
+        rc = task_wait(id, &texit, &retval);
         if (rc != EOK) {
                 printf("%s: Error waiting for %s (%s)\n", NAME, path,
@@ -255 +257 @@
         
         task_id_t id;
-        task_wait_t wait;
-        int rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
+        int rc = task_spawnl(&id, app, app, winreg, NULL);
         if (rc != EOK) {
                 printf("%s: Error spawning %s %s (%s)\n", NAME, app,
@@ -265 +266 @@
         task_exit_t texit;
         int retval;
-        rc = task_wait(&wait, &texit, &retval);
+        rc = task_wait(id, &texit, &retval);
         if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
                 printf("%s: Error retrieving retval from %s (%s)\n", NAME,
@@ -275 +276 @@
 }
 
-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);
+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));
+                }
         } else {
-                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);
+                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));
+                }
         }
 }
@@ -300 +311 @@
 static bool mount_tmpfs(void)
 {
-        int rc = vfs_mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
+        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
         return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
             TMPFS_FS_TYPE, NULL, rc);
 }
 
+static bool mount_data(void)
+{
+        int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0, 0);
+        return mount_report("Data filesystem", DATA_MOUNT_POINT, DATA_FS_TYPE,
+            DATA_DEVICE, rc);
+}
+
 int main(int argc, char *argv[])
 {
-        int rc;
-
         info_print();
         
@@ -320 +336 @@
                 srv_start("/srv/tmpfs");
         
-        srv_start("/srv/klog");
         srv_start("/srv/locfs");
         srv_start("/srv/taskmon");
@@ -334 +349 @@
         srv_start("/srv/apic");
         srv_start("/srv/i8259");
-        srv_start("/srv/icp-ic");
         srv_start("/srv/obio");
         srv_start("/srv/cuda_adb");
         srv_start("/srv/s3c24xx_uart");
         srv_start("/srv/s3c24xx_ts");
-        
-        srv_start("/srv/vbd");
-        srv_start("/srv/volsrv");
         
         srv_start("/srv/loopip");
@@ -349 +360 @@
         srv_start("/srv/udp");
         srv_start("/srv/dnsrsrv");
-        srv_start("/srv/dhcp");
-        srv_start("/srv/nconfsrv");
         
         srv_start("/srv/clipboard");
         srv_start("/srv/remcons");
         
+        /*
+         * Start these synchronously so that mount_data() can be
+         * non-blocking.
+         */
+#ifdef CONFIG_START_BD
+        srv_start("/srv/ata_bd");
+#endif
+        
+#ifdef CONFIG_MOUNT_DATA
+        /* Make sure fat is running. */
+        if (str_cmp(STRING(RDFMT), "fat") != 0)
+                srv_start("/srv/fat");
+        
+        mount_data();
+#else
+        (void) mount_data;
+#endif
+        
         srv_start("/srv/input", HID_INPUT);
         srv_start("/srv/output", HID_OUTPUT);
-        srv_start("/srv/hound");
-        
-        if (!config_key_exists("console")) {
-                rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
+        
+        int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
+        if (rc == EOK) {
+                gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
+                gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+        } else {
+                rc = console(HID_INPUT, HID_OUTPUT);
                 if (rc == EOK) {
-                        gui_start("/app/barber", HID_COMPOSITOR_SERVER);
-                        gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
-                        gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+                        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);
-        }
-        
         return 0;
 }