Changeset 7171760 in mainline for uspace/lib/c/include

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/lib/c/include

Files:

• loader/loader.h (modified) (2 diffs)
• loader/pcb.h (modified) (2 diffs)
• task.h (modified) (2 diffs)
• vfs/vfs.h (modified) (2 diffs)

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);