Changeset 1e9f8ab in mainline

Timestamp:

2010-12-29T17:42:42Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f418e51

Parents:

c41834a

Message:

Add kill command to forcefully terminate a task.

Files:

• boot/Makefile.common (modified) (1 diff)
• kernel/generic/include/proc/task.h (modified) (2 diffs)
• kernel/generic/include/syscall/syscall.h (modified) (1 diff)
• kernel/generic/src/proc/task.c (modified) (1 diff)
• kernel/generic/src/syscall/syscall.c (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/kill/Makefile (added)
• uspace/app/kill/kill.c (added)
• uspace/lib/c/generic/task.c (modified) (1 diff)
• uspace/lib/c/include/task.h (modified) (1 diff)

boot/Makefile.common

@@ -125 +125 @@
 RD_APPS_NON_ESSENTIAL = \
         $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/sbi/sbi \

kernel/generic/include/proc/task.h

@@ -56 +56 @@
 #include <mm/as.h>
 #include <sysinfo/abi.h>
+#include <typedefs.h>
 
 struct thread;
@@ -154 +155 @@
 
 extern sysarg_t sys_task_set_name(const char *, size_t);
+extern sysarg_t sys_task_kill(task_id_t *);
 
 #endif

kernel/generic/include/syscall/syscall.h

@@ -47 +47 @@
         SYS_TASK_GET_ID,
         SYS_TASK_SET_NAME,
+        SYS_TASK_KILL,
         SYS_PROGRAM_SPAWN_LOADER,
         

kernel/generic/src/proc/task.c

@@ -360 +360 @@
 }
 
+/** Syscall to forcefully terminate a task
+ *
+ * @param uspace_taskid Pointer to task ID in user space.
+ *
+ * @return 0 on success or an error code from @ref errno.h.
+ *
+ */
+sysarg_t sys_task_kill(task_id_t *uspace_taskid)
+{
+        task_id_t taskid;
+        int rc;
+
+        rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
+        if (rc != 0)
+                return (sysarg_t) rc;
+
+        return (sysarg_t) task_kill(taskid);
+}
+
 /** Find task structure corresponding to task ID.
  *

kernel/generic/src/syscall/syscall.c

@@ -120 +120 @@
         (syshandler_t) sys_task_get_id,
         (syshandler_t) sys_task_set_name,
+        (syshandler_t) sys_task_kill,
         (syshandler_t) sys_program_spawn_loader,
         

uspace/Makefile

@@ -38 +38 @@
         app/getterm \
         app/init \
+        app/kill \
         app/klog \
         app/mkfat \

uspace/lib/c/generic/task.c

@@ -65 +65 @@
  *
  * @return Zero on success or negative error code.
- *
  */
 int task_set_name(const char *name)
 {
         return __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_size(name));
+}
+
+/** Kill a task.
+ *
+ * @param task_id ID of task to kill.
+ *
+ * @return Zero on success or negative error code.
+ */
+
+int task_kill(task_id_t task_id)
+{
+        return (int) __SYSCALL1(SYS_TASK_KILL, (sysarg_t) &task_id);
 }
 

uspace/lib/c/include/task.h

@@ -47 +47 @@
 extern task_id_t task_get_id(void);
 extern int task_set_name(const char *);
+extern int task_kill(task_id_t);
+
 extern task_id_t task_spawn(const char *, const char *const[], int *);
 extern int task_spawnv(task_id_t *, const char *path, const char *const []);