Changeset 368ee04 in mainline for uspace/lib/c/generic/task.c

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/lib/c/generic/task.c (modified) (6 diffs)

uspace/lib/c/generic/task.c

@@ -48 +48 @@
 #include "private/ns.h"
 #include <vfs/vfs.h>
+#include <unistd.h>
 
 task_id_t task_get_id(void)
@@ -107 +108 @@
 {
         /* Send default files */
-        int *files[4];
-        int fd_stdin;
-        int fd_stdout;
-        int fd_stderr;
-        
-        if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK))
-                files[0] = &fd_stdin;
-        else
-                files[0] = NULL;
-        
-        if ((stdout != NULL) && (vfs_fhandle(stdout, &fd_stdout) == EOK))
-                files[1] = &fd_stdout;
-        else
-                files[1] = NULL;
-        
-        if ((stderr != NULL) && (vfs_fhandle(stderr, &fd_stderr) == EOK))
-                files[2] = &fd_stderr;
-        else
-                files[2] = NULL;
-        
-        files[3] = NULL;
-        
-        return task_spawnvf(id, wait, path, args, files);
+        
+        int fd_stdin = -1;
+        int fd_stdout = -1;
+        int fd_stderr = -1;
+        
+        if (stdin != NULL) {
+                (void) vfs_fhandle(stdin, &fd_stdin);
+        }
+        
+        if (stdout != NULL) {
+                (void) vfs_fhandle(stdout, &fd_stdout);
+        }
+
+        if (stderr != NULL) {
+                (void) vfs_fhandle(stderr, &fd_stderr);
+        }
+        
+        return task_spawnvf(id, wait, path, args, fd_stdin, fd_stdout,
+            fd_stderr);
 }
 
@@ -138 +135 @@
  * 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 wait  If not NULL, setup waiting for task's return value and store
- *              the information necessary for waiting here on success.
- * @param path  Pathname of the binary to execute.
- * @param argv  Command-line arguments.
- * @param files Standard files to use.
+ * @param id      If not NULL, the ID of the task is stored here on success.
+ * @param wait    If not NULL, setup waiting for task's return value and store
+ * @param path    Pathname of the binary to execute.
+ * @param argv    Command-line arguments.
+ * @param std_in  File to use as stdin.
+ * @param std_out File to use as stdout.
+ * @param std_err File to use as stderr.
  *
  * @return Zero on success or negative error code.
@@ -149 +147 @@
  */
 int task_spawnvf(task_id_t *id, task_wait_t *wait, const char *path,
-    const char *const args[], int *const files[])
+    const char *const args[], int fd_stdin, int fd_stdout, int fd_stderr)
 {
         /* Connect to a program loader. */
@@ -169 +167 @@
                 goto error;
         
-        /* Send program pathname. */
-        rc = loader_set_pathname(ldr, path);
+        /* Send program binary. */
+        rc = loader_set_program_path(ldr, path);
         if (rc != EOK)
                 goto error;
@@ -180 +178 @@
         
         /* Send files */
-        rc = loader_set_files(ldr, files);
-        if (rc != EOK)
-                goto error;
+        int root = vfs_root();
+        if (root >= 0) {
+                rc = loader_add_inbox(ldr, "root", root);
+                vfs_put(root);
+                if (rc != EOK)
+                        goto error;
+        }
+        
+        if (fd_stdin >= 0) {
+                rc = loader_add_inbox(ldr, "stdin", fd_stdin);
+                if (rc != EOK)
+                        goto error;
+        }
+        
+        if (fd_stdout >= 0) {
+                rc = loader_add_inbox(ldr, "stdout", fd_stdout);
+                if (rc != EOK)
+                        goto error;
+        }
+        
+        if (fd_stderr >= 0) {
+                rc = loader_add_inbox(ldr, "stderr", fd_stderr);
+                if (rc != EOK)
+                        goto error;
+        }               
         
         /* Load the program. */