Changeset ea28272 in mainline for uspace/app/kill/kill.c

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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:

Merge mainline changes.

File:

• uspace/app/kill/kill.c (moved) (moved from uspace/app/tester/ipc/connect.c ) (2 diffs)

uspace/app/kill/kill.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
+/** @addtogroup kill
+ * @{
+ */
+/**
+ * @file Forecfully terminate a task.
+ */
+
+#include <errno.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <atomic.h>
-#include "../tester.h"
+#include <task.h>
 
-static atomic_t finish;
+#define NAME "kill"
 
-static void callback(void *priv, int retval, ipc_call_t *data)
+static void print_syntax(void)
 {
-        atomic_set(&finish, 1);
+        printf("Syntax: " NAME " <task ID>\n");
 }
 
-const char *test_connect(void)
+int main(int argc, char *argv[])
 {
-        TPRINTF("Connecting to %u...", IPC_TEST_SERVICE);
-        int phone = ipc_connect_me_to(PHONE_NS, IPC_TEST_SERVICE, 0, 0);
-        if (phone > 0) {
-                TPRINTF("phoneid %d\n", phone);
-        } else {
-                TPRINTF("\n");
-                return "ipc_connect_me_to() failed";
+        char *eptr;
+        task_id_t taskid;
+        int rc;
+
+        if (argc != 2) {
+                print_syntax();
+                return 1;
         }
-        
-        printf("Sending synchronous message...\n");
-        int retval = ipc_call_sync_0_0(phone, IPC_TEST_METHOD);
-        TPRINTF("Received response to synchronous message\n");
-        
-        TPRINTF("Sending asynchronous message...\n");
-        atomic_set(&finish, 0);
-        ipc_call_async_0(phone, IPC_TEST_METHOD, NULL, callback, 1);
-        while (atomic_get(&finish) != 1)
-                TPRINTF(".");
-        TPRINTF("Received response to asynchronous message\n");
-        
-        TPRINTF("Hanging up...");
-        retval = ipc_hangup(phone);
-        if (retval == 0) {
-                TPRINTF("OK\n");
-        } else {
-                TPRINTF("\n");
-                return "ipc_hangup() failed";
+
+        taskid = strtoul(argv[1], &eptr, 0);
+        if (*eptr != '\0') {
+                printf("Invalid task ID argument '%s'.\n", argv[1]);
+                return 1;
         }
-        
-        return NULL;
+
+        rc = task_kill(taskid);
+        if (rc != EOK) {
+                printf("Failed to kill task with ID %llu (error %d)\n",
+                    (unsigned long long) taskid, rc);
+                return 2;
+        }
+
+        return 0;
 }
+
+/** @}
+ */