Changeset 0f94c3d in mainline

Timestamp:

2009-03-01T20:51:26Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

2e079b70

Parents:

0d5a50c

Message:

Read command line for multiboot modules on ia32 and copy it to task name. Other arches will need to initialize task names in the init structure to an empty string.

Location:

kernel

Files:

• arch/amd64/src/boot/boot.S (modified) (1 diff)
• arch/ia32/src/boot/cboot.c (modified) (2 diffs)
• generic/include/config.h (modified) (1 diff)
• generic/src/main/kinit.c (modified) (1 diff)
• generic/src/proc/task.c (modified) (4 diffs)

kernel/arch/amd64/src/boot/boot.S

@@ -224 +224 @@
                         
                         addl $16, %esi
-                        addq $16, %rdi
+                        addq $48, %rdi
                         
                         loop mods_loop

kernel/arch/ia32/src/boot/cboot.c

@@ -39 +39 @@
 #include <config.h>
 #include <memstr.h>
+#include <func.h>
 
 /* This is a symbol so the type is only dummy. Obtain the value using &. */
@@ -69 +70 @@
                         init.tasks[i].addr = mods[i].start + 0x80000000;
                         init.tasks[i].size = mods[i].end - mods[i].start;
+
+                        /* Copy command line, if available. */
+                        if (mods[i].string) {
+                                strncpy(init.tasks[i].name, mods[i].string,
+                                    CONFIG_TASK_NAME_BUFLEN - 1);
+                                init.tasks[i].name[CONFIG_TASK_NAME_BUFLEN - 1]
+                                    = '\0';
+                        } else {
+                                init.tasks[i].name[0] = '\0';
+                        }
                 }
         } else {

kernel/generic/include/config.h

@@ -41 +41 @@
 #define STACK_SIZE  PAGE_SIZE
 
-#define CONFIG_INIT_TASKS  32
+#define CONFIG_INIT_TASKS       32
+
+#define CONFIG_TASK_NAME_BUFLEN 32
 
 typedef struct {
         uintptr_t addr;
         size_t size;
+        char name[CONFIG_TASK_NAME_BUFLEN];
 } init_task_t;
 

kernel/generic/src/main/kinit.c

@@ -175 +175 @@
                         continue;
                 }
+
+                char *name = init.tasks[i].name;
+                if (name[0] == '\0') name = "init-bin";
                 
                 int rc = program_create_from_image((void *) init.tasks[i].addr,
-                    "init-bin", &programs[i]);
+                    name, &programs[i]);
                 
                 if ((rc == 0) && (programs[i].task != NULL)) {

kernel/generic/src/proc/task.c

@@ -397 +397 @@
 
 #ifdef __32_BITS__      
-        printf("%-6" PRIu64 " %-10s %-3" PRIu32 " %10p %10p %9" PRIu64
+        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %10p %10p %9" PRIu64
             "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles,
             suffix, atomic_get(&t->refcount), atomic_get(&t->active_calls));
@@ -403 +403 @@
 
 #ifdef __64_BITS__
-        printf("%-6" PRIu64 " %-10s %-3" PRIu32 " %18p %18p %9" PRIu64
+        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %18p %18p %9" PRIu64
             "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles,
             suffix, atomic_get(&t->refcount), atomic_get(&t->active_calls));
@@ -430 +430 @@
         printf("taskid name       ctx address    as         "
             "cycles     threads calls  callee\n");
-        printf("------ ---------- --- ---------- ---------- "
+        printf("------ ------------ --- ---------- ---------- "
             "---------- ------- ------ ------>\n");
 #endif
@@ -437 +437 @@
         printf("taskid name       ctx address            as                 "
             "cycles     threads calls  callee\n");
-        printf("------ ---------- --- ------------------ ------------------ "
+        printf("------ ------------ --- ------------------ ------------------ "
             "---------- ------- ------ ------>\n");
 #endif