Changeset 7171760 in mainline

Timestamp:

2011-08-18T12:05:00Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b33ec43

Parents:

866e627

Message:

Rework the way how open files are passed from parent task to child.

• Instead of passing fdi_node_t's, pass handles directly using the IPC_M_STATE_CHANGE_AUTHORIZE mechanism.
• Remove open_node(), fd_node(), fdi_node_t.
• Replace fopen_node() with fopen_handle().
• Replace fnode() with fhandle().
• The child task does not synchronize with VFS yet.

Location:

uspace

Files:

• app/bdsh/exec.c (modified) (2 diffs)
• app/trace/trace.c (modified) (2 diffs)
• lib/c/generic/io/io.c (modified) (6 diffs)
• lib/c/generic/libc.c (modified) (1 diff)
• lib/c/generic/loader.c (modified) (1 diff)
• lib/c/generic/private/async.h (modified) (1 diff)
• lib/c/generic/private/io.h (modified) (1 diff)
• lib/c/generic/task.c (modified) (2 diffs)
• lib/c/generic/vfs/vfs.c (modified) (2 diffs)
• lib/c/include/loader/loader.h (modified) (2 diffs)
• lib/c/include/loader/pcb.h (modified) (2 diffs)
• lib/c/include/task.h (modified) (2 diffs)
• lib/c/include/vfs/vfs.h (modified) (2 diffs)
• srv/loader/main.c (modified) (4 diffs)

uspace/app/bdsh/exec.c ¶

@@ -100 +100 @@
         char *tmp;
         int rc, retval, i;
-        fdi_node_t file_nodes[3];
-        fdi_node_t *file_nodes_p[4];
+        int file_handles[3];
+        int *file_handles_p[4];
         FILE *files[3];
 
@@ -112 +112 @@
         
         for (i = 0; i < 3 && files[i] != NULL; i++) {
-                if (fnode(files[i], &file_nodes[i]) == EOK) {
-                        file_nodes_p[i] = &file_nodes[i];
+                if (fhandle(files[i], &file_handles[i]) == EOK) {
+                        file_handles_p[i] = &file_handles[i];
                 }
                 else {
-                        file_nodes_p[i] = NULL;
+                        file_handles_p[i] = NULL;
                 }
         }
-        file_nodes_p[i] = NULL;
+        file_handles_p[i] = NULL;
 
-        rc = task_spawnvf(&tid, tmp, (const char **) argv, file_nodes_p);
+        rc = task_spawnvf(&tid, tmp, (const char **) argv, file_handles_p);
         free(tmp);
 

uspace/app/trace/trace.c ¶

@@ -587 +587 @@
 
         /* Send default files */
-        fdi_node_t *files[4];
-        fdi_node_t stdin_node;
-        fdi_node_t stdout_node;
-        fdi_node_t stderr_node;
-        
-        if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK))
-                files[0] = &stdin_node;
+        int *files[4];
+        int fd_stdin;
+        int fd_stdout;
+        int fd_stderr;
+        
+        if ((stdin != NULL) && (fhandle(stdin, &fd_stdin) == EOK))
+                files[0] = &fd_stdin;
         else
                 files[0] = NULL;
         
-        if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK))
-                files[1] = &stdout_node;
+        if ((stdout != NULL) && (fhandle(stdout, &fd_stdout) == EOK))
+                files[1] = &fd_stdout;
         else
                 files[1] = NULL;
         
-        if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK))
-                files[2] = &stderr_node;
+        if ((stderr != NULL) && (fhandle(stderr, &fd_stderr) == EOK))
+                files[2] = &fd_stderr;
         else
                 files[2] = NULL;
@@ -762 +762 @@
         o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_OPEN, o);
-        o = oper_new("open_node", 4, arg_def, V_INT_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_OPEN_NODE, o);
         o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def);
         proto_add_oper(p, VFS_IN_READ, o);

uspace/lib/c/generic/io/io.c ¶

@@ -101 +101 @@
 static LIST_INITIALIZE(files);
 
-void __stdio_init(int filc, fdi_node_t *filv[])
+void __stdio_init(int filc)
 {
         if (filc > 0) {
-                stdin = fopen_node(filv[0], "r");
+                stdin = fopen_handle(0);
         } else {
                 stdin = &stdin_null;
@@ -111 +111 @@
         
         if (filc > 1) {
-                stdout = fopen_node(filv[1], "w");
+                stdout = fopen_handle(1);
         } else {
                 stdout = &stdout_klog;
@@ -118 +118 @@
         
         if (filc > 2) {
-                stderr = fopen_node(filv[2], "w");
+                stderr = fopen_handle(2);
         } else {
                 stderr = &stderr_klog;
@@ -285 +285 @@
 }
 
-FILE *fopen_node(fdi_node_t *node, const char *mode)
-{
-        int flags;
-        if (!parse_mode(mode, &flags))
-                return NULL;
-        
+FILE *fopen_handle(int fd)
+{
         /* Open file. */
         FILE *stream = malloc(sizeof(FILE));
@@ -298 +294 @@
         }
         
-        stream->fd = open_node(node, flags);
-        if (stream->fd < 0) {
-                /* errno was set by open_node() */
-                free(stream);
-                return NULL;
-        }
-        
+        stream->fd = fd;
         stream->error = false;
         stream->eof = false;
@@ -780 +770 @@
 }
 
-int fnode(FILE *stream, fdi_node_t *node)
-{
-        if (stream->fd >= 0)
-                return fd_node(stream->fd, node);
+int fhandle(FILE *stream, int *handle)
+{
+        if (stream->fd >= 0) {
+                *handle = stream->fd;
+                return EOK;
+        }
         
         return ENOENT;

uspace/lib/c/generic/libc.c ¶

@@ -91 +91 @@
                 argc = 0;
                 argv = NULL;
-                __stdio_init(0, NULL);
+                __stdio_init(0);
         } else {
                 argc = __pcb->argc;
                 argv = __pcb->argv;
-                __stdio_init(__pcb->filc, __pcb->filv);
+                __stdio_init(__pcb->filc);
                 (void) chdir(__pcb->cwd);
         }

uspace/lib/c/generic/loader.c ¶

@@ -256 +256 @@
  *
  */
-int loader_set_files(loader_t *ldr, fdi_node_t *const files[])
-{
-        /*
-         * Serialize the arguments into a single array. First
-         * compute size of the buffer needed.
-         */
-        fdi_node_t *const *ap = files;
-        size_t count = 0;
-        while (*ap != NULL) {
-                count++;
-                ap++;
-        }
-        
-        fdi_node_t *files_buf;
-        files_buf = (fdi_node_t *) malloc(count * sizeof(fdi_node_t));
-        if (files_buf == NULL)
-                return ENOMEM;
-        
-        /* Fill the buffer */
-        size_t i;
-        for (i = 0; i < count; i++)
-                files_buf[i] = *files[i];
-        
+int loader_set_files(loader_t *ldr, int * const files[])
+{
         /* Send serialized files to the loader */
         async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, LOADER_SET_FILES, &answer);
-        sysarg_t rc = async_data_write_start(exch, (void *) files_buf,
-            count * sizeof(fdi_node_t));
-        
-        async_exchange_end(exch);
-        free(files_buf);
-        
+        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;
+        
+        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_wait_for(req, NULL);

uspace/lib/c/generic/private/async.h ¶

@@ -36 +36 @@
 #define LIBC_PRIVATE_ASYNC_H_
 
+#include <ipc/common.h>
 #include <adt/list.h>
 #include <fibril.h>

uspace/lib/c/generic/private/io.h ¶

@@ -36 +36 @@
 #define LIBC_PRIVATE_IO_H_
 
-#include <vfs/vfs.h>
-
-extern void __stdio_init(int filc, fdi_node_t *filv[]);
+extern void __stdio_init(int);
 extern void __stdio_done(void);
 

uspace/lib/c/generic/task.c ¶

@@ -103 +103 @@
 {
         /* Send default files */
-        fdi_node_t *files[4];
-        fdi_node_t stdin_node;
-        fdi_node_t stdout_node;
-        fdi_node_t stderr_node;
-        
-        if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK))
-                files[0] = &stdin_node;
+        int *files[4];
+        int fd_stdin;
+        int fd_stdout;
+        int fd_stderr;
+        
+        if ((stdin != NULL) && (fhandle(stdin, &fd_stdin) == EOK))
+                files[0] = &fd_stdin;
         else
                 files[0] = NULL;
         
-        if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK))
-                files[1] = &stdout_node;
+        if ((stdout != NULL) && (fhandle(stdout, &fd_stdout) == EOK))
+                files[1] = &fd_stdout;
         else
                 files[1] = NULL;
         
-        if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK))
-                files[2] = &stderr_node;
+        if ((stderr != NULL) && (fhandle(stderr, &fd_stderr) == EOK))
+                files[2] = &fd_stderr;
         else
                 files[2] = NULL;
@@ -143 +143 @@
  */
 int task_spawnvf(task_id_t *id, const char *path, const char *const args[],
-    fdi_node_t *const files[])
+    int *const files[])
 {
         /* Connect to a program loader. */

uspace/lib/c/generic/vfs/vfs.c ¶

@@ -329 +329 @@
 }
 
-int open_node(fdi_node_t *node, int oflag)
-{
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        ipc_call_t answer;
-        aid_t req = async_send_4(exch, VFS_IN_OPEN_NODE, node->fs_handle,
-            node->devmap_handle, node->index, oflag, &answer);
-        
-        vfs_exchange_end(exch);
-
-        sysarg_t rc;
-        async_wait_for(req, &rc);
-        
-        if (rc != EOK)
-                return (int) rc;
-        
-        return (int) IPC_GET_ARG1(answer);
-}
-
 int close(int fildes)
 {
@@ -819 +800 @@
 }
 
-int fd_node(int fildes, fdi_node_t *node)
-{
-        struct stat stat;
-        int rc = fstat(fildes, &stat);
-        
-        if (rc == EOK) {
-                node->fs_handle = stat.fs_handle;
-                node->devmap_handle = stat.devmap_handle;
-                node->index = stat.index;
-        }
-        
-        return rc;
-}
-
 int dup2(int oldfd, int newfd)
 {

uspace/lib/c/include/loader/loader.h ¶

@@ -39 +39 @@
 #include <task.h>
 
-typedef struct fdi_node fdi_node_t;
-
 /** Forward declararion */
 struct loader;
@@ -51 +49 @@
 extern int loader_set_pathname(loader_t *, const char *);
 extern int loader_set_args(loader_t *, const char *const[]);
-extern int loader_set_files(loader_t *, fdi_node_t *const[]);
+extern int loader_set_files(loader_t *, int *const[]);
 extern int loader_load_program(loader_t *);
 extern int loader_run(loader_t *);

uspace/lib/c/include/loader/pcb.h ¶

@@ -38 +38 @@
 
 #include <sys/types.h>
-#include <vfs/vfs.h>
 
 typedef void (*entry_point_t)(void);
@@ -62 +61 @@
         
         /** Number of preset files. */
-        int filc;
-        /** Preset files. */
-        fdi_node_t **filv;
+        unsigned int filc;
         
         /*

uspace/lib/c/include/task.h ¶

@@ -38 +38 @@
 #include <sys/types.h>
 
-typedef struct fdi_node fdi_node_t;
-
 typedef uint64_t task_id_t;
 
@@ -54 +52 @@
 extern int task_spawnv(task_id_t *, const char *path, const char *const []);
 extern int task_spawnvf(task_id_t *, const char *path, const char *const [],
-    fdi_node_t *const []);
+    int *const []);
 extern int task_spawnl(task_id_t *, const char *path, ...);
 

uspace/lib/c/include/vfs/vfs.h ¶

@@ -46 +46 @@
 };
 
-/** Libc version of the VFS triplet.
- *
- * Unique identification of a file system node
- * within a file system instance.
- *
- */
-typedef struct fdi_node {
-        fs_handle_t fs_handle;
-        devmap_handle_t devmap_handle;
-        fs_index_t index;
-} fdi_node_t;
-
 extern char *absolutize(const char *, size_t *);
 
@@ -64 +52 @@
 extern int unmount(const char *);
 
-extern int open_node(fdi_node_t *, int);
-extern int fd_node(int, fdi_node_t *);
-
-extern FILE *fopen_node(fdi_node_t *, const char *);
-extern int fnode(FILE *, fdi_node_t *);
+extern FILE *fopen_handle(int);
+extern int fhandle(FILE *, int *);
 
 extern async_exch_t *vfs_exchange_begin(void);

uspace/srv/loader/main.c ¶

@@ -61 +61 @@
 #include <elf/elf.h>
 #include <elf/elf_load.h>
+#include <vfs/vfs.h>
 
 #ifdef CONFIG_RTLD
@@ -89 +90 @@
 
 /** Number of preset files */
-static int filc = 0;
-/** Preset files vector */
-static fdi_node_t **filv = NULL;
-/** Buffer holding all preset files */
-static fdi_node_t *fil_buf = NULL;
+static unsigned int filc = 0;
 
 static elf_info_t prog_info;
@@ -239 +236 @@
 static void ldr_set_files(ipc_callid_t rid, ipc_call_t *request)
 {
-        fdi_node_t *buf;
-        size_t buf_size;
-        int rc = async_data_write_accept((void **) &buf, false, 0, 0,
-            sizeof(fdi_node_t), &buf_size);
-        
-        if (rc == EOK) {
-                int count = buf_size / sizeof(fdi_node_t);
-                
-                /*
-                 * Allocate new filv
-                 */
-                fdi_node_t **_filv = (fdi_node_t **) calloc(count + 1, sizeof(fdi_node_t *));
-                if (_filv == NULL) {
-                        free(buf);
-                        async_answer_0(rid, ENOMEM);
-                        return;
+        size_t count = IPC_GET_ARG1(*request);
+
+        async_exch_t *vfs_exch = vfs_exchange_begin();
+
+        for (filc = 0; filc < count; filc++) {
+                ipc_callid_t callid;
+
+                if (!async_state_change_receive(&callid, NULL, NULL, NULL)) {
+                        async_answer_0(callid, EINVAL);
+                        break;
                 }
-                
-                /*
-                 * Fill the new filv with argument pointers
-                 */
-                int i;
-                for (i = 0; i < count; i++)
-                        _filv[i] = &buf[i];
-                
-                _filv[count] = NULL;
-                
-                /*
-                 * Copy temporary data to global variables
-                 */
-                if (fil_buf != NULL)
-                        free(fil_buf);
-                
-                if (filv != NULL)
-                        free(filv);
-                
-                filc = count;
-                fil_buf = buf;
-                filv = _filv;
-        }
-        
+                async_state_change_finalize(callid, vfs_exch);
+        }
+
+        vfs_exchange_end(vfs_exch);
+
         async_answer_0(rid, EOK);
 }
@@ -308 +280 @@
         
         pcb.filc = filc;
-        pcb.filv = filv;
         
         if (prog_info.interp == NULL) {