Changeset 7114d83 in mainline

Timestamp:

2009-07-06T16:02:27Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

5d96851

Parents:

d68e4d5

Message:

Allow task to return value (will be improved).

Location:

uspace

Files:

• app/bdsh/exec.c (modified) (2 diffs)
• app/getvc/getvc.c (modified) (2 diffs)
• lib/libc/generic/libc.c (modified) (2 diffs)
• lib/libc/generic/task.c (modified) (1 diff)
• lib/libc/include/ipc/ns.h (modified) (1 diff)
• lib/libc/include/task.h (modified) (1 diff)
• srv/ns/ns.c (modified) (1 diff)
• srv/ns/task.c (modified) (4 diffs)
• srv/ns/task.h (modified) (1 diff)

uspace/app/bdsh/exec.c

@@ -114 +114 @@
         task_id_t tid;
         char *tmp;
+        int retval;
 
         tmp = str_dup(find_command(cmd));
@@ -126 +127 @@
         }
         
-        task_wait(tid);
+        task_wait(tid, &retval);
+        if (retval != 0)
+                printf("Command failed (return value %d).\n", retval);
+
         return 0;
 }

uspace/app/getvc/getvc.c

@@ -74 +74 @@
 int main(int argc, char *argv[])
 {
+        int retval;
+
         if (argc < 3) {
                 usage();
@@ -98 +100 @@
         version_print(argv[1]);
         task_id_t id = spawn(argv[2]);
-        task_wait(id);
+        task_wait(id, &retval);
         
         return 0;

uspace/lib/libc/generic/libc.c

@@ -62 +62 @@
 void __main(void *pcb_ptr)
 {
+        int retval;
+
         __heap_init();
         __async_init();
@@ -83 +85 @@
         }
         
-        main(argc, argv);
+        retval = main(argc, argv);
+
         __stdio_done();
+        (void) task_retval(retval);
 }
 

uspace/lib/libc/generic/task.c

@@ -149 +149 @@
 }
 
-int task_wait(task_id_t id)
+int task_wait(task_id_t id, int *retval)
 {
-        return (int) async_req_2_0(PHONE_NS, NS_TASK_WAIT, LOWER32(id), UPPER32(id));
+        ipcarg_t rv;
+        int rc;
+
+        rc = (int) async_req_2_1(PHONE_NS, NS_TASK_WAIT, LOWER32(id),
+            UPPER32(id), &rv);
+        *retval = rv;
+
+        return rc;
+}
+
+int task_retval(int val)
+{
+        task_id_t id;
+
+        id = task_get_id();
+        return (int) async_req_3_0(PHONE_NS, NS_RETVAL, LOWER32(id),
+            UPPER32(id), val);
 }
 

uspace/lib/libc/include/ipc/ns.h

@@ -40 +40 @@
 typedef enum {
         NS_PING = IPC_FIRST_USER_METHOD,
-        NS_TASK_WAIT
+        NS_TASK_WAIT,
+        NS_RETVAL
 } ns_request_t;
 

uspace/lib/libc/include/task.h

@@ -43 +43 @@
 extern int task_set_name(const char *name);
 extern task_id_t task_spawn(const char *path, char *const argv[]);
-extern int task_wait(task_id_t id);
+extern int task_wait(task_id_t id, int *retval);
+extern int task_retval(int val);
+
 
 #endif

uspace/srv/ns/ns.c

@@ -171 +171 @@
                         wait_for_task(id, &call, callid);
                         continue;
+                case NS_RETVAL:
+                        retval = ns_task_retval(&call);
+                        break;
                 default:
                         retval = ENOENT;

uspace/srv/ns/task.c

@@ -64 +64 @@
         link_t link;
         task_id_t id;    /**< Task ID. */
+        int retval;
         bool destroyed;
 } hashed_task_t;
@@ -174 +175 @@
                 
                 if (!(pr->callid & IPC_CALLID_NOTIFICATION))
-                        ipc_answer_0(pr->callid, EOK);
+                        ipc_answer_1(pr->callid, EOK, ht->retval);
                 
                 hash_table_remove(&task_hash_table, keys, 2);
@@ -222 +223 @@
                 ht->id = id;
                 ht->destroyed = (et == TASK_CREATE) ? false : true;
+                ht->retval = -1;
                 hash_table_insert(&task_hash_table, keys, &ht->link);
         } else {
@@ -262 +264 @@
 out:
         if (!(callid & IPC_CALLID_NOTIFICATION))
-                ipc_answer_0(callid, retval);
+                ipc_answer_1(callid, retval, ht->retval);
+}
+
+int ns_task_retval(ipc_call_t *call)
+{
+        task_id_t id;
+        unsigned long keys[2];
+
+        id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
+
+        keys[0] = LOWER32(id);
+        keys[1] = UPPER32(id);
+        
+        link_t *link = hash_table_find(&task_hash_table, keys);
+        hashed_task_t *ht = (link != NULL) ?
+            hash_table_get_instance(link, hashed_task_t, link) : NULL;
+        
+        if ((ht == NULL) || ht->destroyed)
+                return EINVAL;
+
+        ht->retval = IPC_GET_ARG3(*call);
+
+        return EOK;
 }
 

uspace/srv/ns/task.h

@@ -43 +43 @@
 extern void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid);
 
+extern int ns_task_retval(ipc_call_t *call);
+
 #endif