Changeset c028b22 in mainline for uspace/lib/c/generic/task.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/lib/c/generic/task.c (modified) (12 diffs)

uspace/lib/c/generic/task.c

@@ -35 +35 @@
 
 #include <task.h>
-#include <libc.h>
-#include <stdlib.h>
-#include <errno.h>
 #include <loader/loader.h>
 #include <stdarg.h>
@@ -43 +40 @@
 #include <ipc/ns.h>
 #include <macros.h>
+#include <assert.h>
 #include <async.h>
+#include <errno.h>
+#include <malloc.h>
+#include <libc.h>
+#include "private/ns.h"
 
 task_id_t task_get_id(void)
@@ -68 +70 @@
 int task_set_name(const char *name)
 {
+        assert(name);
+        
         return __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_size(name));
 }
@@ -88 +92 @@
  * loader API. Arguments are passed as a null-terminated array of strings.
  *
- * @param id    If not NULL, the ID of the task is stored here on success.
- * @param path  Pathname of the binary to execute.
- * @param argv  Command-line arguments.
- *
- * @return      Zero on success or negative error code.
+ * @param id   If not NULL, the ID of the task is stored here on success.
+ * @param path Pathname of the binary to execute.
+ * @param argv Command-line arguments.
+ *
+ * @return Zero on success or negative error code.
+ *
  */
 int task_spawnv(task_id_t *id, const char *path, const char *const args[])
 {
-        loader_t *ldr;
-        task_id_t task_id;
-        int rc;
-
-        /* Connect to a program loader. */
-        ldr = loader_connect();
-        if (ldr == NULL)
-                return EREFUSED;
-        
-        /* Get task ID. */
-        rc = loader_get_task_id(ldr, &task_id);
-        if (rc != EOK)
-                goto error;
-        
-        /* Send spawner's current working directory. */
-        rc = loader_set_cwd(ldr);
-        if (rc != EOK)
-                goto error;
-        
-        /* Send program pathname. */
-        rc = loader_set_pathname(ldr, path);
-        if (rc != EOK)
-                goto error;
-        
-        /* Send arguments. */
-        rc = loader_set_args(ldr, args);
-        if (rc != EOK)
-                goto error;
-        
         /* Send default files */
         fdi_node_t *files[4];
@@ -148 +124 @@
         files[3] = NULL;
         
+        return task_spawnvf(id, path, args, files);
+}
+
+/** Create a new task by running an executable from the filesystem.
+ *
+ * This is really just a convenience wrapper over the more complicated
+ * loader API. Arguments are passed as a null-terminated array of strings.
+ * Files are passed as null-terminated array of pointers to fdi_node_t.
+ *
+ * @param id    If not NULL, the ID of the task is stored here on success.
+ * @param path  Pathname of the binary to execute.
+ * @param argv  Command-line arguments.
+ * @param files Standard files to use.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int task_spawnvf(task_id_t *id, const char *path, const char *const args[],
+    fdi_node_t *const files[])
+{
+        /* Connect to a program loader. */
+        loader_t *ldr = loader_connect();
+        if (ldr == NULL)
+                return EREFUSED;
+        
+        /* Get task ID. */
+        task_id_t task_id;
+        int rc = loader_get_task_id(ldr, &task_id);
+        if (rc != EOK)
+                goto error;
+        
+        /* Send spawner's current working directory. */
+        rc = loader_set_cwd(ldr);
+        if (rc != EOK)
+                goto error;
+        
+        /* Send program pathname. */
+        rc = loader_set_pathname(ldr, path);
+        if (rc != EOK)
+                goto error;
+        
+        /* Send arguments. */
+        rc = loader_set_args(ldr, args);
+        if (rc != EOK)
+                goto error;
+        
+        /* Send files */
         rc = loader_set_files(ldr, files);
         if (rc != EOK)
@@ -163 +186 @@
         
         /* Success */
-        free(ldr);
-        
         if (id != NULL)
                 *id = task_id;
@@ -173 +194 @@
         /* Error exit */
         loader_abort(ldr);
-        free(ldr);
         return rc;
 }
@@ -182 +202 @@
  * loader API. Arguments are passed as a null-terminated list of arguments.
  *
- * @param id    If not NULL, the ID of the task is stored here on success.
- * @param path  Pathname of the binary to execute.
- * @param ...   Command-line arguments.
- *
- * @return      Zero on success or negative error code.
+ * @param id   If not NULL, the ID of the task is stored here on success.
+ * @param path Pathname of the binary to execute.
+ * @param ...  Command-line arguments.
+ *
+ * @return Zero on success or negative error code.
+ *
  */
 int task_spawnl(task_id_t *task_id, const char *path, ...)
 {
+        /* Count the number of arguments. */
+        
         va_list ap;
-        int rc, cnt;
         const char *arg;
         const char **arglist;
-
-        /* Count the number of arguments. */
-        cnt = 0;
+        int cnt = 0;
+        
         va_start(ap, path);
         do {
@@ -203 +224 @@
         } while (arg != NULL);
         va_end(ap);
-
+        
         /* Allocate argument list. */
         arglist = malloc(cnt * sizeof(const char *));
         if (arglist == NULL)
                 return ENOMEM;
-
+        
         /* Fill in arguments. */
         cnt = 0;
@@ -217 +238 @@
         } while (arg != NULL);
         va_end(ap);
-
+        
         /* Spawn task. */
-        rc = task_spawnv(task_id, path, arglist);
-
+        int rc = task_spawnv(task_id, path, arglist);
+        
         /* Free argument list. */
         free(arglist);
@@ -228 +249 @@
 int task_wait(task_id_t id, task_exit_t *texit, int *retval)
 {
+        assert(texit);
+        assert(retval);
+        
+        async_exch_t *exch = async_exchange_begin(session_ns);
         sysarg_t te, rv;
-        int rc;
-
-        rc = (int) async_req_2_2(PHONE_NS, NS_TASK_WAIT, LOWER32(id),
+        int rc = (int) async_req_2_2(exch, NS_TASK_WAIT, LOWER32(id),
             UPPER32(id), &te, &rv);
+        async_exchange_end(exch);
+        
         *texit = te;
         *retval = rv;
-
+        
         return rc;
 }
@@ -241 +266 @@
 int task_retval(int val)
 {
-        return (int) async_req_1_0(PHONE_NS, NS_RETVAL, val);
+        async_exch_t *exch = async_exchange_begin(session_ns);
+        int rc = (int) async_req_1_0(exch, NS_RETVAL, val);
+        async_exchange_end(exch);
+        
+        return rc;
 }