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

Timestamp:

2017-04-05T18:10:39Z (8 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/loader.c (modified) (3 diffs)

uspace/lib/c/generic/loader.c

@@ -124 +124 @@
                 return ENOMEM;
         
-        if (getcwd(cwd, MAX_PATH_LEN + 1) == NULL)
+        if (vfs_cwd_get(cwd, MAX_PATH_LEN + 1) != EOK)
                 str_cpy(cwd, MAX_PATH_LEN + 1, "/");
         
@@ -147 +147 @@
 }
 
-/** Set pathname of the program to load.
- *
- * Sets the name of the program file to load. The name can be relative
- * to the current working directory (it will be absolutized before
- * sending to the loader).
+/** Set the program to load.
  *
  * @param ldr  Loader connection structure.
- * @param path Pathname of the program file.
- *
- * @return Zero on success or negative error code.
- *
- */
-int loader_set_pathname(loader_t *ldr, const char *path)
-{
-        size_t pa_len;
-        char *pa = vfs_absolutize(path, &pa_len);
-        if (!pa)
-                return ENOMEM;
-        
-        /* Send program pathname */
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
+ * @param name Name to set for the spawned program.
+ * @param file Program file.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int loader_set_program(loader_t *ldr, const char *name, int file)
+{
+        async_exch_t *exch = async_exchange_begin(ldr->sess);
+
         ipc_call_t answer;
-        aid_t req = async_send_0(exch, LOADER_SET_PATHNAME, &answer);
-        sysarg_t rc = async_data_write_start(exch, (void *) pa, pa_len);
-        
-        async_exchange_end(exch);
-        free(pa);
-        
+        aid_t req = async_send_0(exch, LOADER_SET_PROGRAM, &answer);
+
+        sysarg_t rc = async_data_write_start(exch, name, str_size(name) + 1);
+        if (rc == EOK) {
+                async_exch_t *vfs_exch = vfs_exchange_begin();
+                rc = vfs_pass_handle(vfs_exch, file, exch);
+                vfs_exchange_end(vfs_exch);
+        }
+
+        async_exchange_end(exch);
+
         if (rc != EOK) {
                 async_forget(req);
                 return (int) rc;
         }
-        
+
         async_wait_for(req, &rc);
         return (int) rc;
 }
+
+/** Set the program to load by path.
+ *
+ * @param ldr  Loader connection structure.
+ * @param path Program path.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int loader_set_program_path(loader_t *ldr, const char *path)
+{
+        const char *name = str_rchr(path, '/');
+        if (name == NULL) {
+                name = path;
+        } else {
+                name++;
+        }
+        
+        int fd = vfs_lookup(path, 0);
+        if (fd < 0) {
+                return fd;
+        }
+        
+        int rc = loader_set_program(ldr, name, fd);
+        vfs_put(fd);
+        return rc;
+}
+
 
 /** Set command-line arguments for the program.
@@ -244 +268 @@
 }
 
-/** Set preset files for the program.
- *
- * Sets the vector of preset files to be passed to the loaded
- * program. By convention, the first three files represent stdin,
- * stdout and stderr respectively.
- *
- * @param ldr   Loader connection structure.
- * @param files NULL-terminated array of pointers to files.
- *
- * @return Zero on success or negative error code.
- *
- */
-int loader_set_files(loader_t *ldr, int * const files[])
-{
-        /* Send serialized files to the loader */
+/** Add a file to the task's inbox.
+ *
+ * @param ldr        Loader connection structure.
+ * @param name       Identification of the file.
+ * @param file       The file's descriptor.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int loader_add_inbox(loader_t *ldr, const char *name, int file)
+{
         async_exch_t *exch = async_exchange_begin(ldr->sess);
         async_exch_t *vfs_exch = vfs_exchange_begin();
         
-        int i;
-        for (i = 0; files[i]; i++);
-
-        ipc_call_t answer;
-        aid_t req = async_send_1(exch, LOADER_SET_FILES, i, &answer);
-
-        sysarg_t rc = EOK;
-        
-        for (i = 0; files[i]; i++) {
-                rc = async_state_change_start(exch, VFS_PASS_HANDLE, *files[i],
-                    0, vfs_exch); 
-                if (rc != EOK)
-                        break;
-        }
-        
-        vfs_exchange_end(vfs_exch);
-        async_exchange_end(exch);
-
-        if (rc != EOK) {
-                async_forget(req);
-                return (int) rc;
-        }
-        
-        async_wait_for(req, &rc);
+        aid_t req = async_send_0(exch, LOADER_ADD_INBOX, NULL);
+        
+        sysarg_t rc = async_data_write_start(exch, name, str_size(name) + 1);
+        if (rc == EOK) {
+                rc = vfs_pass_handle(vfs_exch, file, exch);
+        }
+        
+        async_exchange_end(vfs_exch);
+        async_exchange_end(exch);
+        
+        if (rc == EOK) {
+                async_wait_for(req, &rc);
+        } else {
+                async_forget(req);
+        }
+        
         return (int) rc;
 }