Changes in kernel/generic/src/main/kinit.c [a4e23f8c:221c9ec] in mainline

File:

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

kernel/generic/src/main/kinit.c

@@ -69 +69 @@
 #include <str.h>
 #include <sysinfo/stats.h>
-#include <sysinfo/sysinfo.h>
 #include <align.h>
 
@@ -117 +116 @@
                  * Just a beautification.
                  */
-                thread = thread_create(kmp, NULL, TASK,
-                    THREAD_FLAG_UNCOUNTED, "kmp");
+                thread = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true);
                 if (thread != NULL) {
-                        thread_wire(thread, &cpus[0]);
+                        irq_spinlock_lock(&thread->lock, false);
+                        thread->cpu = &cpus[0];
+                        irq_spinlock_unlock(&thread->lock, false);
                         thread_ready(thread);
                 } else
@@ -134 +134 @@
                 
                 for (i = 0; i < config.cpu_count; i++) {
-                        thread = thread_create(kcpulb, NULL, TASK,
-                            THREAD_FLAG_UNCOUNTED, "kcpulb");
+                        thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);
                         if (thread != NULL) {
-                                thread_wire(thread, &cpus[i]);
+                                irq_spinlock_lock(&thread->lock, false);
+                                thread->cpu = &cpus[i];
+                                irq_spinlock_unlock(&thread->lock, false);
                                 thread_ready(thread);
                         } else
@@ -151 +152 @@
         
         /* Start thread computing system load */
-        thread = thread_create(kload, NULL, TASK, THREAD_FLAG_NONE,
-            "kload");
+        thread = thread_create(kload, NULL, TASK, 0, "kload", false);
         if (thread != NULL)
                 thread_ready(thread);
@@ -163 +163 @@
                  * Create kernel console.
                  */
-                thread = thread_create(kconsole_thread, NULL, TASK,
-                    THREAD_FLAG_NONE, "kconsole");
+                thread = thread_create(kconsole_thread, NULL, TASK, 0, "kconsole", false);
                 if (thread != NULL)
                         thread_ready(thread);
@@ -172 +171 @@
 #endif /* CONFIG_KCONSOLE */
         
-        /*
-         * Store the default stack size in sysinfo so that uspace can create
-         * stack with this default size.
-         */
-        sysinfo_set_item_val("default.stack_size", NULL, STACK_SIZE_USER);
-        
         interrupts_enable();
         
@@ -186 +179 @@
         program_t programs[CONFIG_INIT_TASKS];
         
-        // FIXME: do not propagate arguments through sysinfo
-        // but pass them directly to the tasks
-        for (i = 0; i < init.cnt; i++) {
-                const char *arguments = init.tasks[i].arguments;
-                if (str_length(arguments) == 0)
-                        continue;
-                if (str_length(init.tasks[i].name) == 0)
-                        continue;
-                size_t arguments_size = str_size(arguments);
-
-                void *arguments_copy = malloc(arguments_size, 0);
-                if (arguments_copy == NULL)
-                        continue;
-                memcpy(arguments_copy, arguments, arguments_size);
-
-                char item_name[CONFIG_TASK_NAME_BUFLEN + 15];
-                snprintf(item_name, CONFIG_TASK_NAME_BUFLEN + 15,
-                    "init_args.%s", init.tasks[i].name);
-
-                sysinfo_set_item_data(item_name, NULL, arguments_copy, arguments_size);
-        }
-
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].paddr % FRAME_SIZE) {
@@ -230 +201 @@
                 str_cpy(namebuf + INIT_PREFIX_LEN,
                     TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name);
-                
+
                 /*
                  * Create virtual memory mappings for init task images.
@@ -250 +221 @@
                                     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);
-                                }
                         }
                         
@@ -273 +236 @@
                         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,
-                            programs[i].loader_status);
+                        printf("init[%zu]: Init binary load failed (error %d)\n", i, rc);
         }