Changeset c8cbd39 in mainline

Timestamp:

2012-08-16T10:59:59Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04da852

Parents:

5882487

Message:

Hack: copy kernel arguments to sysinfo

Location:

kernel

Files:

• genarch/include/multiboot/multiboot.h (modified) (1 diff)
• genarch/src/multiboot/multiboot.c (modified) (2 diffs)
• genarch/src/multiboot/multiboot2.c (modified) (1 diff)
• generic/include/config.h (modified) (2 diffs)
• generic/src/main/kinit.c (modified) (2 diffs)

kernel/genarch/include/multiboot/multiboot.h

@@ -99 +99 @@
 
 extern void multiboot_extract_command(char *, size_t, const char *);
+extern void multiboot_extract_argument(char *, size_t, const char *);
 extern void multiboot_info_parse(uint32_t, const multiboot_info_t *);
 

kernel/genarch/src/multiboot/multiboot.c

@@ -71 +71 @@
 }
 
+/** Extract arguments from the multiboot module command line.
+ *
+ * @param buf      Destination buffer (will be always NULL-terminated).
+ * @param size     Size of destination buffer (in bytes).
+ * @param cmd_line Input string (the command line).
+ *
+ */
+void multiboot_extract_argument(char *buf, size_t size, const char *cmd_line)
+{
+        /* Start after first space. */
+        const char *start = str_chr(cmd_line, ' ');
+        if (start == NULL) {
+                str_cpy(buf, size, "");
+                return;
+        }
+
+        const char *end = cmd_line + str_size(cmd_line);
+
+        /* Skip the space(s). */
+        while (start != end) {
+                if (start[0] == ' ')
+                        start++;
+                else
+                        break;
+        }
+
+        str_ncpy(buf, size, start, (size_t) (end - start));
+}
+
 static void multiboot_modules(uint32_t count, multiboot_module_t *mods)
 {
@@ -84 +113 @@
                         multiboot_extract_command(init.tasks[init.cnt].name,
                             CONFIG_TASK_NAME_BUFLEN, MULTIBOOT_PTR(mods[i].string));
-                } else
+                        multiboot_extract_argument(init.tasks[init.cnt].arguments,
+                            CONFIG_TASK_ARGUMENTS_BUFLEN, MULTIBOOT_PTR(mods[i].string));
+                } else {
                         init.tasks[init.cnt].name[0] = 0;
+                        init.tasks[init.cnt].arguments[0] = 0;
+                }
                 
                 init.cnt++;

kernel/genarch/src/multiboot/multiboot2.c

@@ -49 +49 @@
                 multiboot_extract_command(init.tasks[init.cnt].name,
                     CONFIG_TASK_NAME_BUFLEN, module->string);
+                multiboot_extract_argument(init.tasks[init.cnt].arguments,
+                    CONFIG_TASK_ARGUMENTS_BUFLEN, module->string);
                 
                 init.cnt++;

kernel/generic/include/config.h

@@ -47 +47 @@
 #define CONFIG_INIT_TASKS        32
 #define CONFIG_TASK_NAME_BUFLEN  32
+#define CONFIG_TASK_ARGUMENTS_BUFLEN 64
 
 #ifndef __ASM__
@@ -56 +57 @@
         size_t size;
         char name[CONFIG_TASK_NAME_BUFLEN];
+        char arguments[CONFIG_TASK_ARGUMENTS_BUFLEN];
 } init_task_t;
 

kernel/generic/src/main/kinit.c

@@ -69 +69 @@
 #include <str.h>
 #include <sysinfo/stats.h>
+#include <sysinfo/sysinfo.h>
 #include <align.h>
 
@@ -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) {