Changeset 03362fbd in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

kernel/generic/src/main/kinit.c

@@ -69 +69 @@
 #include <str.h>
 #include <sysinfo/stats.h>
+#include <sysinfo/sysinfo.h>
 #include <align.h>
 
@@ -171 +172 @@
 #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();
         
@@ -179 +186 @@
         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) {