Changes in uspace/app/init/init.c [28f8f6f2:51da086] in mainline

File:

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

uspace/app/init/init.c

@@ -34 +34 @@
  */
 
-#include <fibril.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -48 +47 @@
 #include <config.h>
 #include <io/logctl.h>
-#include <vfs/vfs.h>
 #include <vol.h>
 #include "untar.h"
 #include "init.h"
 
+#define BANNER_LEFT   "######> "
+#define BANNER_RIGHT  " <######"
+
 #define ROOT_DEVICE       "bd/initrd"
 #define ROOT_MOUNT_POINT  "/"
@@ -65 +66 @@
 #define APP_GETTERM  "/app/getterm"
 
-#define SRV_DISPLAY  "/srv/hid/display"
-#define DISPLAY_SVC  "hid/display"
+#define SRV_COMPOSITOR  "/srv/hid/compositor"
 
 #define HID_INPUT              "hid/input"
 #define HID_OUTPUT             "hid/output"
+#define HID_COMPOSITOR_SERVER  ":0"
 
 #define srv_start(path, ...) \
@@ -83 +84 @@
 {
         printf("%s: HelenOS init\n", NAME);
+}
+
+static void oom_check(errno_t rc, const char *path)
+{
+        if (rc == ENOMEM) {
+                printf("%sOut-of-memory condition detected%s\n", BANNER_LEFT,
+                    BANNER_RIGHT);
+                printf("%sBailing out of the boot process after %s%s\n",
+                    BANNER_LEFT, path, BANNER_RIGHT);
+                printf("%sMore physical memory is required%s\n", BANNER_LEFT,
+                    BANNER_RIGHT);
+                exit(ENOMEM);
+        }
 }
 
@@ -201 +215 @@
 
         if (rc != EOK) {
+                oom_check(rc, path);
                 printf("%s: Error spawning %s (%s)\n", NAME, path,
                     str_error(rc));
@@ -256 +271 @@
 }
 
-static errno_t display_server(void)
-{
-        return srv_start(SRV_DISPLAY);
-}
-
-static int gui_start(const char *app, const char *display_svc)
-{
-        printf("%s: Spawning %s\n", NAME, app);
+static errno_t compositor(const char *isvc, const char *name)
+{
+        /* Wait for the input service to be ready */
+        service_id_t service_id;
+        errno_t rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Error waiting on %s (%s)\n", NAME, isvc,
+                    str_error(rc));
+                return rc;
+        }
+
+        return srv_start(SRV_COMPOSITOR, isvc, name);
+}
+
+static int gui_start(const char *app, const char *srv_name)
+{
+        char winreg[50];
+        snprintf(winreg, sizeof(winreg), "%s%s%s", "comp", srv_name, "/winreg");
+
+        printf("%s: Spawning %s %s\n", NAME, app, winreg);
 
         task_id_t id;
         task_wait_t wait;
-        errno_t rc = task_spawnl(&id, &wait, app, app, display_svc, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s (%s)\n", NAME, app,
-                    str_error(rc));
-                return -1;
+        errno_t rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
+        if (rc != EOK) {
+                oom_check(rc, app);
+                printf("%s: Error spawning %s %s (%s)\n", NAME, app,
+                    winreg, str_error(rc));
+                return rc;
         }
 
@@ -280 +308 @@
                 printf("%s: Error retrieving retval from %s (%s)\n", NAME,
                     app, str_error(rc));
-                return -1;
+                return rc;
         }
 
@@ -294 +322 @@
                 errno_t rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
                     LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
-                if (rc != EOK)
+                if (rc != EOK) {
+                        oom_check(rc, APP_GETTERM);
                         printf("%s: Error spawning %s %s %s --msg --wait -- %s\n",
                             NAME, APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
+                }
         } else {
                 printf("%s: Spawning %s %s %s --wait -- %s\n", NAME,
@@ -303 +333 @@
                 errno_t rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
                     LOCFS_MOUNT_POINT, "--wait", "--", app, NULL);
-                if (rc != EOK)
+                if (rc != EOK) {
+                        oom_check(rc, APP_GETTERM);
                         printf("%s: Error spawning %s %s %s --wait -- %s\n",
                             NAME, APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
+                }
         }
 }
@@ -448 +480 @@
 
         if (!config_key_exists("console")) {
-                rc = display_server();
+                rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
                 if (rc == EOK) {
-                        gui_start("/app/barber", DISPLAY_SVC);
-                        gui_start("/app/vlaunch", DISPLAY_SVC);
-                        gui_start("/app/vterm", DISPLAY_SVC);
+                        gui_start("/app/barber", HID_COMPOSITOR_SERVER);
+                        gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
+                        gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
                 }
         }