Changeset 7114d83 in mainline for uspace/lib

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:

5d96851b

Parents:

d68e4d5

Message:

Allow task to return value (will be improved).

Location:

uspace/lib/libc

Files:

• generic/libc.c (modified) (2 diffs)
• generic/task.c (modified) (1 diff)
• include/ipc/ns.h (modified) (1 diff)
• include/task.h (modified) (1 diff)

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