Changeset 5a4fef9 in mainline for kernel/generic/src

Timestamp:

2009-11-16T21:24:28Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

18baf9c0

Parents:

5f678b1c (diff), 9c70ed6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged head changes to this branch

Location:

kernel/generic/src

Files:

• console/cmd.c (modified) (9 diffs)
• console/console.c (modified) (1 diff)
• ipc/kbox.c (modified) (1 diff)

kernel/generic/src/console/cmd.c

@@ -409 +409 @@
 };
 
+/* Data and methods for 'kill' command */
+static int cmd_kill(cmd_arg_t *argv);
+static cmd_arg_t kill_argv = {
+        .type = ARG_TYPE_INT,
+};
+static cmd_info_t kill_info = {
+        .name = "kill",
+        .description = "kill <taskid> Kill a task.",
+        .func = cmd_kill,
+        .argc = 1,
+        .argv = &kill_argv
+};
+
 /* Data and methods for 'zone' command */
 static int cmd_zone(cmd_arg_t *argv);
@@ -459 +472 @@
         &help_info,
         &ipc_info,
+        &kill_info,
         &set4_info,
         &slabs_info,
@@ -848 +862 @@
  * @return Always 1
  */
-int cmd_slabs(cmd_arg_t * argv) {
+int cmd_slabs(cmd_arg_t * argv)
+{
         slab_print_list();
         return 1;
@@ -860 +875 @@
  * @return Always 1
  */
-int cmd_threads(cmd_arg_t * argv) {
+int cmd_threads(cmd_arg_t * argv)
+{
         thread_print_list();
         return 1;
@@ -871 +887 @@
  * @return Always 1
  */
-int cmd_tasks(cmd_arg_t * argv) {
+int cmd_tasks(cmd_arg_t * argv)
+{
         task_print_list();
         return 1;
@@ -882 +899 @@
  * @return Always 1
  */
-int cmd_sched(cmd_arg_t * argv) {
+int cmd_sched(cmd_arg_t * argv)
+{
         sched_print_list();
         return 1;
@@ -893 +911 @@
  * return Always 1
  */
-int cmd_zones(cmd_arg_t * argv) {
+int cmd_zones(cmd_arg_t * argv)
+{
         zone_print_list();
         return 1;
@@ -904 +923 @@
  * return Always 1
  */
-int cmd_zone(cmd_arg_t * argv) {
+int cmd_zone(cmd_arg_t * argv)
+{
         zone_print_one(argv[0].intval);
         return 1;
@@ -915 +935 @@
  * return Always 1
  */
-int cmd_ipc(cmd_arg_t * argv) {
+int cmd_ipc(cmd_arg_t * argv)
+{
         ipc_print_task(argv[0].intval);
         return 1;
 }
 
+/** Command for killing a task
+ *
+ * @param argv Integer argument from cmdline expected
+ *
+ * return 0 on failure, 1 on success.
+ */
+int cmd_kill(cmd_arg_t * argv)
+{
+        if (task_kill(argv[0].intval) != EOK)
+                return 0;
+
+        return 1;
+}
 
 /** Command for listing processors.

kernel/generic/src/console/console.c

@@ -319 +319 @@
         
         if (size > PAGE_SIZE)
-                return ELIMIT;
+                return (unative_t) ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return ENOMEM;
+                        return (unative_t) ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return rc;
+                        return (unative_t) rc;
                 }
                 data[size] = 0;

kernel/generic/src/ipc/kbox.c

@@ -137 +137 @@
                 /* Only detach kbox thread unless already terminating. */
                 mutex_lock(&TASK->kb.cleanup_lock);
-                if (&TASK->kb.finished == false) {
+                if (TASK->kb.finished == false) {
                         /* Detach kbox thread so it gets freed from memory. */
                         thread_detach(TASK->kb.thread);