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

File:

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

kernel/generic/src/main/kinit.c

@@ -69 +69 @@
 #include <str.h>
 #include <sysinfo/stats.h>
+#include <sysinfo/sysinfo.h>
 #include <align.h>
 
@@ -77 +78 @@
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
-#include <synch/workqueue.h>
-#include <synch/rcu.h>
 
 #define ALIVE_CHARS  4
@@ -105 +104 @@
          */
         thread_detach(THREAD);
-
+        
         interrupts_disable();
-        
-        /* Start processing RCU callbacks. RCU is fully functional afterwards. */
-        rcu_kinit_init();
-        
-        /*
-         * Start processing work queue items. Some may have been queued during boot.
-         */
-        workq_global_worker_init();
         
 #ifdef CONFIG_SMP
@@ -189 +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) {