Changes in kernel/generic/src/main/kinit.c [67b152e:b2fa1204] in mainline

File:

• kernel/generic/src/main/kinit.c (modified) (7 diffs)

kernel/generic/src/main/kinit.c

@@ -59 +59 @@
 #include <mm/km.h>
 #include <print.h>
+#include <log.h>
 #include <memstr.h>
 #include <console/console.h>
@@ -140 +141 @@
                                 thread_ready(thread);
                         } else
-                                printf("Unable to create kcpulb thread for cpu%u\n", i);
+                                log(LF_OTHER, LVL_ERROR,
+                                    "Unable to create kcpulb thread for cpu%u", i);
                 }
         }
@@ -156 +158 @@
                 thread_ready(thread);
         else
-                printf("Unable to create kload thread\n");
+                log(LF_OTHER, LVL_ERROR, "Unable to create kload thread");
         
 #ifdef CONFIG_KCONSOLE
@@ -168 +170 @@
                         thread_ready(thread);
                 else
-                        printf("Unable to create kconsole thread\n");
+                        log(LF_OTHER, LVL_ERROR,
+                            "Unable to create kconsole thread");
         }
 #endif /* CONFIG_KCONSOLE */
@@ -210 +213 @@
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].paddr % FRAME_SIZE) {
-                        printf("init[%zu]: Address is not frame aligned\n", i);
+                        log(LF_OTHER, LVL_ERROR,
+                            "init[%zu]: Address is not frame aligned", i);
                         programs[i].task = NULL;
                         continue;
@@ -250 +254 @@
                                     CAP_IO_MANAGER | CAP_IRQ_REG);
                                 
-                                if (!ipc_phone_0)
+                                if (!ipc_phone_0) {
                                         ipc_phone_0 = &programs[i].task->answerbox;
+                                        /*
+                                         * Hold the first task so that the
+                                         * ipc_phone_0 remains a valid pointer
+                                         * even if the first task exits for
+                                         * whatever reason.
+                                         */
+                                        task_hold(programs[i].task);
+                                }
                         }
                         
@@ -265 +277 @@
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else
-                        printf("init[%zu]: Init binary load failed "
-                            "(error %d, loader status %u)\n", i, rc,
+                        log(LF_OTHER, LVL_ERROR,
+                            "init[%zu]: Init binary load failed "
+                            "(error %d, loader status %u)", i, rc,
                             programs[i].loader_status);
         }