Changeset bc18d63 in mainline

Timestamp:

2009-03-01T15:00:24Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

4b241f3

Parents:

4c7257b

Message:

task_set_name() syscall so that we can have names (for userspace-loaded) tasks again.

Files:

• kernel/generic/include/proc/task.h (modified) (1 diff)
• kernel/generic/include/syscall/syscall.h (modified) (1 diff)
• kernel/generic/src/proc/program.c (modified) (1 diff)
• kernel/generic/src/proc/task.c (modified) (1 diff)
• kernel/generic/src/syscall/syscall.c (modified) (1 diff)
• uspace/lib/libc/generic/task.c (modified) (2 diffs)
• uspace/lib/libc/include/task.h (modified) (1 diff)
• uspace/srv/loader/main.c (modified) (1 diff)

kernel/generic/include/proc/task.h

@@ -145 +145 @@
 
 extern unative_t sys_task_get_id(task_id_t *uspace_task_id);
+extern unative_t sys_task_set_name(const char *uspace_name, size_t name_len);
 
 #endif

kernel/generic/include/syscall/syscall.h

@@ -45 +45 @@
         
         SYS_TASK_GET_ID,
+        SYS_TASK_SET_NAME,
         SYS_PROGRAM_SPAWN_LOADER,
         

kernel/generic/src/proc/program.c

@@ -207 +207 @@
         /* Cap length of name and copy it from userspace. */
 
-        if (name_len > THREAD_NAME_BUFLEN - 1)
-                name_len = THREAD_NAME_BUFLEN - 1;
+        if (name_len > TASK_NAME_BUFLEN - 1)
+                name_len = TASK_NAME_BUFLEN - 1;
 
         rc = copy_from_uspace(namebuf, uspace_name, name_len);

kernel/generic/src/proc/task.c

@@ -250 +250 @@
 }
 
+/** Syscall for setting the task name.
+ *
+ * The name simplifies identifying the task in the task list.
+ *
+ * @param name  The new name for the 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_task_set_name(const char *uspace_name, size_t name_len)
+{
+        int rc;
+        char namebuf[TASK_NAME_BUFLEN];
+
+        /* Cap length of name and copy it from userspace. */
+
+        if (name_len > TASK_NAME_BUFLEN - 1)
+                name_len = TASK_NAME_BUFLEN - 1;
+
+        rc = copy_from_uspace(namebuf, uspace_name, name_len);
+        if (rc != 0)
+                return (unative_t) rc;
+
+        namebuf[name_len] = '\0';
+        strcpy(TASK->name, namebuf);
+
+        return EOK;
+}
+
 /** Find task structure corresponding to task ID.
  *

kernel/generic/src/syscall/syscall.c

@@ -150 +150 @@
         
         (syshandler_t) sys_task_get_id,
+        (syshandler_t) sys_task_set_name,
         (syshandler_t) sys_program_spawn_loader,
         

uspace/lib/libc/generic/task.c

@@ -39 +39 @@
 #include <errno.h>
 #include <loader/loader.h>
+#include <string.h>
 
 task_id_t task_get_id(void)
@@ -47 +48 @@
 
         return task_id;
+}
+
+/** Set the task name.
+ *
+ * @param name  The new name, typically the command used to execute the
+ *              program.
+ * @return      Zero on success or negative error code.
+ */
+int task_set_name(const char *name)
+{
+        return __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, strlen(name));
 }
 

uspace/lib/libc/include/task.h

@@ -41 +41 @@
 
 extern task_id_t task_get_id(void);
+extern int task_set_name(const char *name);
 extern task_id_t task_spawn(const char *path, char *const argv[]);
 

uspace/srv/loader/main.c

@@ -271 +271 @@
 static void loader_run(ipc_callid_t rid, ipc_call_t *request)
 {
+        /* Set the task name. */
+        task_set_name(pathname);
+
         if (is_dyn_linked == true) {
                 /* Dynamically linked program */