Changes in kernel/generic/src/main/kinit.c [a78b0a0:bdca26a] in mainline

File:

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

kernel/generic/src/main/kinit.c

@@ -61 +61 @@
 #include <stdio.h>
 #include <log.h>
-#include <memw.h>
+#include <mem.h>
 #include <console/console.h>
 #include <interrupt.h>
@@ -69 +69 @@
 #include <ipc/ipc.h>
 #include <str.h>
-#include <str_error.h>
 #include <sysinfo/stats.h>
 #include <sysinfo/sysinfo.h>
 #include <align.h>
 #include <stdlib.h>
-#include <debug/register.h>
 
 #ifdef CONFIG_SMP
@@ -104 +102 @@
         thread_t *thread;
 
+        /*
+         * Detach kinit as nobody will call thread_join_timeout() on it.
+         */
+        thread_detach(THREAD);
+
         interrupts_disable();
 
 #ifdef CONFIG_SMP
         if (config.cpu_count > 1) {
+                waitq_initialize(&ap_completion_wq);
+
                 /*
                  * Create the kmp thread and wait for its completion.
@@ -120 +125 @@
 
                 thread_wire(thread, &cpus[0]);
-                thread_start(thread);
+                thread_ready(thread);
                 thread_join(thread);
+                thread_detach(thread);
 
                 /*
@@ -133 +139 @@
                         if (thread != NULL) {
                                 thread_wire(thread, &cpus[i]);
-                                thread_start(thread);
-                                thread_detach(thread);
+                                thread_ready(thread);
                         } else
                                 log(LF_OTHER, LVL_ERROR,
@@ -150 +155 @@
         thread = thread_create(kload, NULL, TASK, THREAD_FLAG_NONE,
             "kload");
-        if (thread != NULL) {
-                thread_start(thread);
-                thread_detach(thread);
-        } else {
+        if (thread != NULL)
+                thread_ready(thread);
+        else
                 log(LF_OTHER, LVL_ERROR, "Unable to create kload thread");
-        }
 
 #ifdef CONFIG_KCONSOLE
@@ -164 +167 @@
                 thread = thread_create(kconsole_thread, NULL, TASK,
                     THREAD_FLAG_NONE, "kconsole");
-                if (thread != NULL) {
-                        thread_start(thread);
-                        thread_detach(thread);
-                } else {
+                if (thread != NULL)
+                        thread_ready(thread);
+                else
                         log(LF_OTHER, LVL_ERROR,
                             "Unable to create kconsole thread");
-                }
         }
 #endif /* CONFIG_KCONSOLE */
@@ -186 +187 @@
          */
         size_t i;
-        program_t programs[CONFIG_INIT_TASKS] = { };
+        program_t programs[CONFIG_INIT_TASKS];
 
         // FIXME: do not propagate arguments through sysinfo
@@ -241 +242 @@
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
                 assert(page);
-
-                if (str_cmp(name, "kernel.dbg") == 0) {
-                        /*
-                         * Not an actual init task, but rather debug sections extracted
-                         * from the kernel ELF file and handed to us here so we can use
-                         * it for debugging.
-                         */
-
-                        register_debug_data((void *) page, init.tasks[i].size);
-                        programs[i].task = NULL;
-                        continue;
-                }
 
                 if (str_cmp(name, "loader") == 0) {
@@ -270 +259 @@
                 }
 
-                errno_t rc = program_create_from_image((void *) page, init.tasks[i].size, namebuf,
+                errno_t rc = program_create_from_image((void *) page, namebuf,
                     &programs[i]);
 
@@ -294 +283 @@
                         }
 
-                } else if (str_cmp(name, "initrd.img") == 0) {
+                } else if (i == init.cnt - 1) {
+                        /*
+                         * Assume the last task is the RAM disk.
+                         */
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else {
@@ -308 +300 @@
          */
         for (i = 0; i < init.cnt; i++) {
-                if (programs[i].task != NULL) {
+                if (programs[i].task != NULL)
                         program_ready(&programs[i]);
-                        task_release(programs[i].task);
-                }
         }