Changeset ec01adf in mainline

Timestamp:

2007-11-03T17:16:47Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3e56ab9

Parents:

828d215

Message:

VFS work.
Start implementing VFS side of VFS_OPEN.
Add vfs_node.c to contain VFS node related internal functions.

Location:

uspace/srv/vfs

Files:

• Makefile (modified) (1 diff)
• vfs.h (modified) (1 diff)
• vfs_lookup.c (modified) (1 diff)
• vfs_mount.c (modified) (1 diff)
• vfs_node.c (added)
• vfs_open.c (modified) (3 diffs)
• vfs_register.c (modified) (1 diff)

uspace/srv/vfs/Makefile

@@ -43 +43 @@
 SOURCES = \
         vfs.c \
+        vfs_node.c \
         vfs_register.c \
         vfs_lookup.c \

uspace/srv/vfs/vfs.h

@@ -173 +173 @@
 
 extern int vfs_lookup_internal(char *, size_t, vfs_triplet_t *, vfs_pair_t *);
+extern vfs_node_t *vfs_node_get(vfs_triplet_t *);
 
 #define MAX_OPEN_FILES  128     

uspace/srv/vfs/vfs_lookup.c

@@ -32 +32 @@
 
 /**
- * @file        vfs.c
+ * @file        vfs_lookup.c
  * @brief       VFS_LOOKUP method and Path Lookup Buffer code.
  */

uspace/srv/vfs/vfs_mount.c

@@ -32 +32 @@
 
 /**
- * @file        vfs.c
+ * @file        vfs_mount.c
  * @brief       VFS_MOUNT method.
  */

uspace/srv/vfs/vfs_open.c

@@ -32 +32 @@
 
 /**
- * @file        vfs.c
+ * @file        vfs_open.c
  * @brief       VFS_OPEN method.
  */
@@ -67 +67 @@
 static bool vfs_conn_open_files_init(void)
 {
+        /*
+         * Optimized fast path that will never go to sleep unnecessarily.
+         * The assumption is that once files is non-zero, it will never be zero
+         * again.
+         */
+        if (files)
+                return true;
+                
         futex_down(&files_futex);
         if (!files) {
@@ -86 +94 @@
                 return;
         }
+
+        /*
+         * The POSIX interface is open(path, flags, mode).
+         * We can receive flags and mode along with the VFS_OPEN call; the path
+         * will need to arrive in another call.
+         */
+        int flags = IPC_GET_ARG1(*request);
+        int mode = IPC_GET_ARG2(*request);
+        size_t size;
+
+        ipc_callid_t callid;
+        ipc_call_t call;
+
+        if (!ipc_data_receive(&callid, &call, NULL, &size)) {
+                ipc_answer_fast_0(callid, EINVAL);
+                ipc_answer_fast_0(rid, EINVAL);
+                return;
+        }
+
+        /*
+         * Now we are on the verge of accepting the path.
+         *
+         * There is one optimization we could do in the future: copy the path
+         * directly into the PLB using some kind of a callback.
+         */
+        char *path = malloc(size);
+        
+        if (!path) {
+                ipc_answer_fast_0(callid, ENOMEM);
+                ipc_answer_fast_0(rid, ENOMEM);
+                return;
+        }
+
+        int rc;
+        if (rc = ipc_data_deliver(callid, &call, path, size)) {
+                ipc_answer_fast_0(rid, rc);
+                free(path);
+                return;
+        }
+        
+        /*
+         * The path is now populated and we can call vfs_lookup_internal().
+         */
+        vfs_triplet_t triplet;
+        rc = vfs_lookup_internal(path, size, &triplet, NULL);
+        if (rc) {
+                ipc_answer_fast_0(rid, rc);
+                free(path);
+                return;
+        }
+
+        /*
+         * Path is no longer needed.
+         */
+        free(path);
+
+        vfs_node_t *node = vfs_node_get(&triplet);
+        // TODO: not finished   
 }
 

uspace/srv/vfs/vfs_register.c

@@ -32 +32 @@
 
 /**
- * @file        vfs.c
+ * @file        vfs_register.c
  * @brief       VFS_REGISTER method.
  */