Changes in uspace/app/init/init.c [8fefd8b:51da086] in mainline

File:

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

uspace/app/init/init.c

@@ -51 +51 @@
 #include "init.h"
 
+#define BANNER_LEFT   "######> "
+#define BANNER_RIGHT  " <######"
+
 #define ROOT_DEVICE       "bd/initrd"
 #define ROOT_MOUNT_POINT  "/"
@@ -81 +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);
+        }
 }
 
@@ -199 +215 @@
 
         if (rc != EOK) {
+                oom_check(rc, path);
                 printf("%s: Error spawning %s (%s)\n", NAME, path,
                     str_error(rc));
@@ -279 +296 @@
         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 -1;
+                return rc;
         }
 
@@ -290 +308 @@
                 printf("%s: Error retrieving retval from %s (%s)\n", NAME,
                     app, str_error(rc));
-                return -1;
+                return rc;
         }
 
@@ -304 +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,
@@ -313 +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);
+                }
         }
 }