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

Timestamp:

2017-03-07T20:47:35Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a737667e

Parents:

e796dc8

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 20:47:35)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 20:47:35)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1941-1944

Original commit messages:

1944: Jiri Zarevucky 2013-08-06 Replace legacy file descriptor presetting with inbox.
1943: Jiri Zarevucky 2013-08-06 Do not preserve open state when passing file descriptor to another task. Allow receiver to specify, whether the descriptor is low or high.
1942: Jiri Zarevucky 2013-08-06 C style.
1941: Jiri Zarevucky 2013-08-06 Make loader accept file reference instead of a pathname.

Modifications:

• Keep version of elf_load_file() that accepts file name
• Changes required for loading dynamically linked executables
• Update to newer list_foreach

File:

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

uspace/lib/c/generic/task.c

@@ -107 +107 @@
 {
         /* 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 +134 @@
  * 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 +146 @@
  */
 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 +166 @@
                 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 +177 @@
         
         /* Send files */
-        rc = loader_set_files(ldr, files);
-        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. */