Changes in kernel/generic/src/main/kinit.c [db675dd:c8cbd39] in mainline

File:

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

kernel/generic/src/main/kinit.c

@@ -69 +69 @@
 #include <str.h>
 #include <sysinfo/stats.h>
+#include <sysinfo/sysinfo.h>
 #include <align.h>
 
@@ -116 +117 @@
                  * Just a beautification.
                  */
-                thread = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true);
+                thread = thread_create(kmp, NULL, TASK,
+                    THREAD_FLAG_UNCOUNTED, "kmp");
                 if (thread != NULL) {
-                        irq_spinlock_lock(&thread->lock, false);
-                        thread->cpu = &cpus[0];
-                        irq_spinlock_unlock(&thread->lock, false);
+                        thread_wire(thread, &cpus[0]);
                         thread_ready(thread);
                 } else
@@ -134 +134 @@
                 
                 for (i = 0; i < config.cpu_count; i++) {
-                        thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);
+                        thread = thread_create(kcpulb, NULL, TASK,
+                            THREAD_FLAG_UNCOUNTED, "kcpulb");
                         if (thread != NULL) {
-                                irq_spinlock_lock(&thread->lock, false);
-                                thread->cpu = &cpus[i];
-                                irq_spinlock_unlock(&thread->lock, false);
+                                thread_wire(thread, &cpus[i]);
                                 thread_ready(thread);
                         } else
@@ -152 +151 @@
         
         /* Start thread computing system load */
-        thread = thread_create(kload, NULL, TASK, 0, "kload", false);
+        thread = thread_create(kload, NULL, TASK, THREAD_FLAG_NONE,
+            "kload");
         if (thread != NULL)
                 thread_ready(thread);
@@ -163 +163 @@
                  * Create kernel console.
                  */
-                thread = thread_create(kconsole_thread, NULL, TASK, 0, "kconsole", false);
+                thread = thread_create(kconsole_thread, NULL, TASK,
+                    THREAD_FLAG_NONE, "kconsole");
                 if (thread != NULL)
                         thread_ready(thread);
@@ -179 +180 @@
         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) {