Changes in uspace/app/init/init.c [ffa2c8ef:f019cc07] in mainline

File:

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

uspace/app/init/init.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <ipc/ipc.h>
 #include <vfs/vfs.h>
 #include <bool.h>
@@ -45 +46 @@
 #include <malloc.h>
 #include <macros.h>
-#include <str.h>
+#include <string.h>
 #include <devmap.h>
-#include <str_error.h>
+#include <config.h>
 #include "init.h"
 
-#define ROOT_DEVICE       "bd/initrd"
-#define ROOT_MOUNT_POINT  "/"
-
-#define DEVFS_FS_TYPE      "devfs"
-#define DEVFS_MOUNT_POINT  "/dev"
-
-#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"
-#define APP_GETTERM  "/app/getterm"
-
 static void info_print(void)
 {
-        printf("%s: HelenOS init\n", NAME);
-}
-
-static bool mount_report(const char *desc, const char *mntpt,
-    const char *fstype, const char *dev, int rc)
-{
+        printf(NAME ": HelenOS init\n");
+}
+
+static bool mount_root(const char *fstype)
+{
+        char *opts = "";
+        const char *root_dev = "initrd";
+        
+        if (str_cmp(fstype, "tmpfs") == 0)
+                opts = "restore";
+        
+        int rc = mount(fstype, "/", root_dev, opts, IPC_FLAG_BLOCKING);
+        
         switch (rc) {
         case EOK:
-                if (dev != NULL)
-                        printf("%s: %s mounted on %s (%s at %s)\n", NAME, desc, mntpt,
-                            fstype, dev);
-                else
-                        printf("%s: %s mounted on %s (%s)\n", NAME, desc, mntpt, fstype);
+                printf(NAME ": Root filesystem mounted, %s at %s\n",
+                    fstype, root_dev);
                 break;
         case EBUSY:
-                printf("%s: %s already mounted on %s\n", NAME, desc, mntpt);
+                printf(NAME ": Root filesystem already mounted\n");
                 return false;
         case ELIMIT:
-                printf("%s: %s limit exceeded\n", NAME, desc);
+                printf(NAME ": Unable to mount root filesystem\n");
                 return false;
         case ENOENT:
-                printf("%s: %s unknown type (%s)\n", NAME, desc, fstype);
+                printf(NAME ": Unknown filesystem type (%s)\n", fstype);
                 return false;
         default:
-                printf("%s: %s not mounted on %s (%s)\n", NAME, desc, mntpt,
-                    str_error(rc));
+                printf(NAME ": Error mounting root filesystem (%d)\n", rc);
                 return false;
         }
@@ -100 +88 @@
 }
 
-static bool mount_root(const char *fstype)
-{
-        const char *opts = "";
-        
-        if (str_cmp(fstype, "tmpfs") == 0)
-                opts = "restore";
-        
-        int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
-            IPC_FLAG_BLOCKING);
-        return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
-            ROOT_DEVICE, rc);
-}
-
 static bool mount_devfs(void)
 {
-        int rc = mount(DEVFS_FS_TYPE, DEVFS_MOUNT_POINT, "", "",
-            IPC_FLAG_BLOCKING);
-        return mount_report("Device filesystem", DEVFS_MOUNT_POINT, DEVFS_FS_TYPE,
-            NULL, rc);
-}
-
-static void spawn(const char *fname)
-{
-        int rc;
+        char null[MAX_DEVICE_NAME];
+        int null_id = devmap_null_create();
+        
+        if (null_id == -1) {
+                printf(NAME ": Unable to create null device\n");
+                return false;
+        }
+        
+        snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
+        int rc = mount("devfs", "/dev", null, "", IPC_FLAG_BLOCKING);
+        
+        switch (rc) {
+        case EOK:
+                printf(NAME ": Device filesystem mounted\n");
+                break;
+        case EBUSY:
+                printf(NAME ": Device filesystem already mounted\n");
+                devmap_null_destroy(null_id);
+                return false;
+        case ELIMIT:
+                printf(NAME ": Unable to mount device filesystem\n");
+                devmap_null_destroy(null_id);
+                return false;
+        case ENOENT:
+                printf(NAME ": Unknown filesystem type (devfs)\n");
+                devmap_null_destroy(null_id);
+                return false;
+        default:
+                printf(NAME ": Error mounting device filesystem (%d)\n", rc);
+                devmap_null_destroy(null_id);
+                return false;
+        }
+        
+        return true;
+}
+
+static void spawn(char *fname)
+{
+        char *argv[2];
         struct stat s;
         
@@ -129 +134 @@
                 return;
         
-        printf("%s: Spawning %s\n", NAME, fname);
-        rc = task_spawnl(NULL, fname, fname, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s (%s)\n", NAME, fname,
-                    str_error(rc));
-        }
-}
-
-static void srv_start(const char *fname)
-{
+        printf(NAME ": Spawning %s\n", fname);
+        
+        argv[0] = fname;
+        argv[1] = NULL;
+        
+        if (!task_spawn(fname, argv))
+                printf(NAME ": Error spawning %s\n", fname);
+}
+
+static void srv_start(char *fname)
+{
+        char *argv[2];
         task_id_t id;
         task_exit_t texit;
@@ -147 +154 @@
                 return;
         
-        printf("%s: Starting %s\n", NAME, fname);
-        rc = task_spawnl(&id, fname, fname, NULL);
+        printf(NAME ": Starting %s\n", fname);
+        
+        argv[0] = fname;
+        argv[1] = NULL;
+        
+        id = task_spawn(fname, argv);
         if (!id) {
-                printf("%s: Error spawning %s (%s)\n", NAME, fname,
-                    str_error(rc));
-                return;
-        }
-        
+                printf(NAME ": Error spawning %s\n", fname);
+                return;
+        }
+
         rc = task_wait(id, &texit, &retval);
         if (rc != EOK) {
-                printf("%s: Error waiting for %s (%s(\n", NAME, fname,
-                    str_error(rc));
-                return;
-        }
-        
-        if (texit != TASK_EXIT_NORMAL) {
-                printf("%s: Server %s failed to start (unexpectedly "
-                    "terminated)\n", NAME, fname);
-                return;
-        }
-
-        if (retval != 0) {
-                printf("%s: Server %s failed to start (exit code %d)\n", NAME,
+                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 console(const char *dev)
-{
-        char hid_in[DEVMAP_NAME_MAXLEN];
+static void getvc(char *dev, char *app)
+{
+        char *argv[4];
+        char vc[MAX_DEVICE_NAME];
         int rc;
         
-        snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
-        
-        printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, hid_in);
-        
-        /* Wait for the input device to be ready */
-        devmap_handle_t handle;
+        snprintf(vc, MAX_DEVICE_NAME, "/dev/%s", dev);
+        
+        printf(NAME ": Spawning getvc on %s\n", vc);
+        
+        dev_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Error waiting on %s (%s)\n", NAME, hid_in,
-                    str_error(rc));
-                return;
-        }
-        
-        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, hid_in, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE,
-                    hid_in, str_error(rc));
-        }
-}
-
-static void getterm(const char *dev, const char *app, bool wmsg)
-{
-        char term[DEVMAP_NAME_MAXLEN];
+        
+        if (rc == EOK) {
+                argv[0] = "/app/getvc";
+                argv[1] = vc;
+                argv[2] = app;
+                argv[3] = NULL;
+                
+                if (!task_spawn("/app/getvc", argv))
+                        printf(NAME ": Error spawning getvc on %s\n", vc);
+        } else {
+                printf(NAME ": Error waiting on %s\n", vc);
+        }
+}
+
+static void mount_data(void)
+{
         int rc;
-        
-        snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
-        
-        printf("%s: Spawning %s %s %s\n", NAME, APP_GETTERM, term, app);
-        
-        /* Wait for the terminal device to be ready */
-        devmap_handle_t handle;
-        rc = devmap_device_get_handle(dev, &handle, 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 {
-                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));
-                }
-        }
-}
-
-static bool mount_tmpfs(void)
-{
-        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 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);
-        return mount_report("Data filesystem", DATA_MOUNT_POINT, DATA_FS_TYPE,
-            DATA_DEVICE, rc);
+
+        printf("Trying to mount disk0 on /data... ");
+        fflush(stdout);
+
+        rc = mount("fat", "/data", "disk0", "wtcache", 0);
+        if (rc == EOK)
+                printf("OK\n");
+        else
+                printf("Failed\n");
 }
 
@@ -253 +222 @@
         
         if (!mount_root(STRING(RDFMT))) {
-                printf("%s: Exiting\n", NAME);
+                printf(NAME ": Exiting\n");
                 return -1;
         }
         
-        /* Make sure tmpfs is running. */
-        if (str_cmp(STRING(RDFMT), "tmpfs") != 0) {
-                spawn("/srv/tmpfs");
-        }
-        
         spawn("/srv/devfs");
-        spawn("/srv/taskmon");
         
         if (!mount_devfs()) {
-                printf("%s: Exiting\n", NAME);
+                printf(NAME ": Exiting\n");
                 return -2;
         }
         
-        mount_tmpfs();
-        
-        spawn("/srv/apic");
-        spawn("/srv/i8259");
+        spawn("/srv/fb");
+        spawn("/srv/kbd");
+        spawn("/srv/console");
         spawn("/srv/fhc");
         spawn("/srv/obio");
-        srv_start("/srv/cuda_adb");
-        srv_start("/srv/i8042");
-        srv_start("/srv/s3c24ser");
-        srv_start("/srv/adb_ms");
-        srv_start("/srv/char_ms");
-        srv_start("/srv/s3c24ts");
-        
-        spawn("/srv/fb");
-        spawn("/srv/kbd");
-        console("hid_in/kbd");
-        
-        spawn("/srv/clip");
-        
+
         /*
          * Start these synchronously so that mount_data() can be
@@ -299 +249 @@
         (void) srv_start;
 #endif
-        
+
 #ifdef CONFIG_MOUNT_DATA
         mount_data();
@@ -305 +255 @@
         (void) mount_data;
 #endif
-        
-        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);
+
+        getvc("vc0", "/app/bdsh");
+        getvc("vc1", "/app/bdsh");
+        getvc("vc2", "/app/bdsh");
+        getvc("vc3", "/app/bdsh");
+        getvc("vc4", "/app/bdsh");
+        getvc("vc5", "/app/bdsh");
+        getvc("vc6", "/app/klog");
         
         return 0;