Changeset 24345a5 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2008-11-08T10:01:59Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

24d6efc

Parents:

7faabb7

Message:

Set meaningful names for loaded programs. Now 'tasks' kconsole command is much less obscure.

File:

• kernel/generic/src/proc/program.c (modified) (10 diffs)

kernel/generic/src/proc/program.c

@@ -68 +68 @@
  * @param as            Address space containing a binary program image.
  * @param entry_addr    Program entry-point address in program address space.
+ * @param name          Name to set for the program's task.
  * @param p             Buffer for storing program information.
  */
-void program_create(as_t *as, uintptr_t entry_addr, program_t *p)
+void program_create(as_t *as, uintptr_t entry_addr, char *name, program_t *p)
 {
         as_area_t *a;
@@ -82 +83 @@
         kernel_uarg->uspace_uarg = NULL;
         
-        p->task = task_create(as, "app");
+        p->task = task_create(as, name);
         ASSERT(p->task);
 
@@ -107 +108 @@
  *
  * @param image_addr    Address of an executable program image.
+ * @param name          Name to set for the program's task.
  * @param p             Buffer for storing program info. If image_addr
  *                      points to a loader image, p->task will be set to
@@ -113 +115 @@
  * @return EOK on success or negative error code.
  */
-int program_create_from_image(void *image_addr, program_t *p)
+int program_create_from_image(void *image_addr, char *name, program_t *p)
 {
         as_t *as;
@@ -137 +139 @@
         }
 
-        program_create(as, ((elf_header_t *) image_addr)->e_entry, p);
+        program_create(as, ((elf_header_t *) image_addr)->e_entry, name, p);
 
         return EOK;
@@ -144 +146 @@
 /** Create a task from the program loader image.
  *
- * @param p Buffer for storing program info.
+ * @param p     Buffer for storing program info.
+ * @param name  Name to set for the program's task.
+ *
  * @return EOK on success or negative error code.
  */
-int program_create_loader(program_t *p)
+int program_create_loader(program_t *p, char *name)
 {
         as_t *as;
@@ -168 +172 @@
         }
 
-        program_create(as, ((elf_header_t *) program_loader)->e_entry, p);
+        program_create(as, ((elf_header_t *) program_loader)->e_entry,
+            name, p);
 
         return EOK;
@@ -189 +194 @@
  * to it and stores the phone id into the provided buffer.
  *
- * @param uspace_phone_id Userspace address where to store the phone id.
+ * @param uspace_phone_id       Userspace address where to store the phone id.
+ * @param name                  Name to set on the new task (typically the same
+ *                              as the command used to execute it).
  *
  * @return 0 on success or an error code from @ref errno.h.
  */
-unative_t sys_program_spawn_loader(int *uspace_phone_id)
+unative_t sys_program_spawn_loader(int *uspace_phone_id, char *uspace_name,
+    size_t name_len)
 {
         program_t p;
@@ -199 +207 @@
         int rc;
         int phone_id;
+        char namebuf[TASK_NAME_BUFLEN];
 
         fake_id = 0;
@@ -208 +217 @@
                 return rc;
 
+        /* Cap length of name and copy it from userspace. */
+
+        if (name_len > THREAD_NAME_BUFLEN - 1)
+                name_len = THREAD_NAME_BUFLEN - 1;
+
+        rc = copy_from_uspace(namebuf, uspace_name, name_len);
+        if (rc != 0)
+                return (unative_t) rc;
+
+        namebuf[name_len] = '\0';
+
+        /* Allocate the phone for communicating with the new task. */
+
         phone_id = phone_alloc();
         if (phone_id < 0)
                 return ELIMIT;
 
-        rc = program_create_loader(&p);
+        /* Spawn the new task. */
+
+        rc = program_create_loader(&p, namebuf);
         if (rc != 0)
                 return rc;