Changeset 828d215 in mainline

Timestamp:

2007-11-03T15:25:01Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ec01adf

Parents:

20614d0

Message:

VFS work.

Allocate the open filess array dynamically and protect access to it via a
per-connection futex. Defer its allocation until the client makes a first
VFS_OPEN request.

Actually call vfs_mount() and vfs_open(), respectively, when the VFS_MOUNT and
VFS_OPEN requests, respectively, are received from the client.

Location:

uspace/srv/vfs

Files:

• vfs.c (modified) (2 diffs)
• vfs.h (modified) (1 diff)
• vfs_open.c (modified) (3 diffs)

uspace/srv/vfs/vfs.c

@@ -57 +57 @@
 
         /*
-         * Initialize the table of open files.
-         */
-        if (!vfs_conn_open_files_init()) {
-                ipc_answer_fast_0(iid, ENOMEM);
-                return;
-        }
-
-        /*
          * The connection was opened via the IPC_CONNECT_ME_TO call.
          * This call needs to be answered.
@@ -97 +89 @@
                         break;
                 case VFS_MOUNT:
+                        vfs_mount(callid, &call);
+                        keep_on_going = false;
+                        break;
+                case VFS_OPEN:
+                        vfs_open(callid, &call);
+                        break;
                 case VFS_UNMOUNT:
-                case VFS_OPEN:
                 case VFS_CREATE:
                 case VFS_CLOSE:

uspace/srv/vfs/vfs.h

@@ -176 +176 @@
 #define MAX_OPEN_FILES  128     
 
-extern bool vfs_conn_open_files_init(void);
-
 extern void vfs_register(ipc_callid_t, ipc_call_t *);
 extern void vfs_mount(ipc_callid_t, ipc_call_t *);

uspace/srv/vfs/vfs_open.c

@@ -44 +44 @@
 #include <futex.h>
 #include <libadt/list.h>
+#include <sys/types.h>
 #include "vfs.h"
+
+/** Per-connection futex protecting the files array. */
+__thread atomic_t files_futex = FUTEX_INITIALIZER;
 
 /**
@@ -54 +58 @@
  * the functionality will stay unchanged. So unless the client knows what it is
  * doing, it should open one connection to VFS only.
+ *
+ * Allocation of the open files table is deferred until the client makes the
+ * first VFS_OPEN operation.
  */
-__thread vfs_file_t files[MAX_OPEN_FILES];
+__thread vfs_file_t *files = NULL;
 
 /** Initialize the table of open files. */
-bool vfs_conn_open_files_init(void)
+static bool vfs_conn_open_files_init(void)
 {
-        memset(files, 0, MAX_OPEN_FILES * sizeof(vfs_file_t));
+        futex_down(&files_futex);
+        if (!files) {
+                files = malloc(MAX_OPEN_FILES * sizeof(vfs_file_t));
+                if (!files) {
+                        futex_up(&files_futex);
+                        return false;
+                }
+                memset(files, 0, MAX_OPEN_FILES * sizeof(vfs_file_t));
+        }
+        futex_up(&files_futex);
         return true;
 }
@@ -66 +82 @@
 void vfs_open(ipc_callid_t rid, ipc_call_t *request)
 {
+        if (!vfs_conn_open_files_init()) {
+                ipc_answer_fast_0(rid, ENOMEM);
+                return;
+        }
 }