Changeset 04803bf in mainline for uspace/lib/c/generic/task.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/generic/task.c (moved) (moved from uspace/lib/libc/generic/task.c ) (7 diffs)

uspace/lib/c/generic/task.c

@@ -39 +39 @@
 #include <errno.h>
 #include <loader/loader.h>
-#include <string.h>
+#include <stdarg.h>
+#include <str.h>
 #include <ipc/ns.h>
 #include <macros.h>
@@ -46 +47 @@
 task_id_t task_get_id(void)
 {
+#ifdef __32_BITS__
         task_id_t task_id;
         (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id);
         
         return task_id;
+#endif  /* __32_BITS__ */
+        
+#ifdef __64_BITS__
+        return (task_id_t) __SYSCALL0(SYS_TASK_GET_ID);
+#endif  /* __64_BITS__ */
 }
 
@@ -58 +65 @@
  *
  * @return Zero on success or negative error code.
- *
  */
 int task_set_name(const char *name)
@@ -65 +71 @@
 }
 
+/** Kill a task.
+ *
+ * @param task_id ID of task to kill.
+ *
+ * @return Zero on success or negative error code.
+ */
+
+int task_kill(task_id_t task_id)
+{
+        return (int) __SYSCALL1(SYS_TASK_KILL, (sysarg_t) &task_id);
+}
+
 /** Create a new task by running an executable from the filesystem.
  *
  * This is really just a convenience wrapper over the more complicated
- * loader API.
- *
- * @param path pathname of the binary to execute
- * @param argv command-line arguments
- *
- * @return ID of the newly created task or zero on error.
- *
- */
-task_id_t task_spawn(const char *path, char *const args[])
-{
+ * 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.
+ */
+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. */
-        loader_t *ldr = loader_connect();
+        ldr = loader_connect();
         if (ldr == NULL)
-                return 0;
+                return EREFUSED;
         
         /* Get task ID. */
-        task_id_t task_id;
-        int rc = loader_get_task_id(ldr, &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;
@@ -98 +124 @@
         if (rc != EOK)
                 goto error;
-        
         
         /* Send default files */
@@ -139 +164 @@
         /* Success */
         free(ldr);
-        return task_id;
+        
+        if (id != NULL)
+                *id = task_id;
+        
+        return EOK;
         
 error:
@@ -145 +174 @@
         loader_abort(ldr);
         free(ldr);
-        
-        return 0;
+        return rc;
+}
+
+/** 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 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.
+ */
+int task_spawnl(task_id_t *task_id, const char *path, ...)
+{
+        va_list ap;
+        int rc, cnt;
+        const char *arg;
+        const char **arglist;
+
+        /* Count the number of arguments. */
+        cnt = 0;
+        va_start(ap, path);
+        do {
+                arg = va_arg(ap, const char *);
+                cnt++;
+        } 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;
+        va_start(ap, path);
+        do {
+                arg = va_arg(ap, const char *);
+                arglist[cnt++] = arg;
+        } while (arg != NULL);
+        va_end(ap);
+
+        /* Spawn task. */
+        rc = task_spawnv(task_id, path, arglist);
+
+        /* Free argument list. */
+        free(arglist);
+        return rc;
 }
 
 int task_wait(task_id_t id, task_exit_t *texit, int *retval)
 {
-        ipcarg_t te, rv;
+        sysarg_t te, rv;
         int rc;