Changeset 20f1597 in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2009-03-02T22:13:30Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

561db3f

Parents:

16da5f8e

Message:

Task names should only contain base names of commands. Also add 'boot:' prefix for binaries loaded by the kernel.

File:

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

kernel/generic/src/main/kinit.c

@@ -65 +65 @@
 #include <lib/rd.h>
 #include <ipc/ipc.h>
+#include <debug.h>
+#include <string.h>
 
 #ifdef CONFIG_SMP
@@ -78 +80 @@
 static char alive[ALIVE_CHARS] = "-\\|/";
 #endif
+
+#define BOOT_PREFIX             "boot:"
+#define BOOT_PREFIX_LEN         5
 
 /** Kernel initialization thread.
@@ -176 +181 @@
                 }
 
-                char *name = init.tasks[i].name;
-                if (name[0] == '\0') name = "init-bin";
+                /*
+                 * Construct task name from the 'boot:' prefix and the
+                 * name stored in the init structure (if any).
+                 */
+
+                char namebuf[TASK_NAME_BUFLEN], *name;
+
+                name = init.tasks[i].name;
+                if (name[0] == '\0') name = "<unknown>";
+
+                ASSERT(TASK_NAME_BUFLEN >= BOOT_PREFIX_LEN);
+                strncpy(namebuf, BOOT_PREFIX, TASK_NAME_BUFLEN);
+                strncpy(namebuf + BOOT_PREFIX_LEN, name,
+                    TASK_NAME_BUFLEN - BOOT_PREFIX_LEN);
                 
                 int rc = program_create_from_image((void *) init.tasks[i].addr,
-                    name, &programs[i]);
+                    namebuf, &programs[i]);
                 
                 if ((rc == 0) && (programs[i].task != NULL)) {