Changeset 27b76ca in mainline

Timestamp:

2011-08-18T14:05:10Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

44451ee

Parents:

b33ec43

Message:

Synchronize VFS handle acceptor with VFS.

• Introduce VFS_IN_WAIT_HANDLE.
• Add vfs_wait_handle() to VFS.
• Add fd_wait() to libc.
• Use fd_wait() in loader.

Location:

uspace

Files:

• lib/c/generic/vfs/vfs.c (modified) (1 diff)
• lib/c/include/ipc/vfs.h (modified) (1 diff)
• lib/c/include/vfs/vfs.h (modified) (1 diff)
• srv/loader/main.c (modified) (2 diffs)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (2 diffs)
• srv/vfs/vfs_file.c (modified) (8 diffs)
• srv/vfs/vfs_ops.c (modified) (1 diff)

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

@@ -815 +815 @@
 }
 
+int fd_wait(void)
+{
+        async_exch_t *exch = vfs_exchange_begin();
+        
+        sysarg_t ret;
+        sysarg_t rc = async_req_0_1(exch, VFS_IN_WAIT_HANDLE, &ret);
+        
+        vfs_exchange_end(exch);
+        
+        if (rc == EOK)
+                return (int) ret;
+        
+        return (int) rc;
+}
+
 /** @}
  */

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

@@ -77 +77 @@
         VFS_IN_RENAME,
         VFS_IN_STAT,
-        VFS_IN_DUP
+        VFS_IN_DUP,
+        VFS_IN_WAIT_HANDLE,
 } vfs_in_request_t;
 

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

@@ -55 +55 @@
 extern int fhandle(FILE *, int *);
 
+extern int fd_wait(void);
+
 extern async_exch_t *vfs_exchange_begin(void);
 extern void vfs_exchange_end(async_exch_t *);

uspace/srv/loader/main.c

@@ -242 +242 @@
         for (filc = 0; filc < count; filc++) {
                 ipc_callid_t callid;
+                int fd;
 
                 if (!async_state_change_receive(&callid, NULL, NULL, NULL)) {
@@ -248 +249 @@
                 }
                 async_state_change_finalize(callid, vfs_exch);
+                fd = fd_wait();
+                assert(fd == (int) filc);
         }
 

uspace/srv/vfs/vfs.c

@@ -118 +118 @@
                 case VFS_IN_DUP:
                         vfs_dup(callid, &call);
+                        break;
+                case VFS_IN_WAIT_HANDLE:
+                        vfs_wait_handle(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);

uspace/srv/vfs/vfs.h

@@ -189 +189 @@
 
 extern void vfs_pass_handle(sysarg_t, sysarg_t, int);
+extern int vfs_wait_handle_internal(void);
 
 extern vfs_file_t *vfs_file_get(int);
@@ -215 +216 @@
 extern void vfs_unlink(ipc_callid_t, ipc_call_t *);
 extern void vfs_rename(ipc_callid_t, ipc_call_t *);
+extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *);
 
 #endif

uspace/srv/vfs/vfs_file.c

@@ -43 +43 @@
 #include <fibril.h>
 #include <fibril_synch.h>
+#include <adt/list.h>
 #include "vfs.h"
 
@@ -50 +51 @@
 typedef struct {
         fibril_mutex_t lock;
+        fibril_condvar_t cv;
+        list_t passed_handles;
         vfs_file_t **files;
 } vfs_client_data_t;
+
+typedef struct {
+        link_t link;
+        int handle;
+} vfs_boxed_handle_t;
 
 static int _vfs_fd_free(vfs_client_data_t *, int);
@@ -85 +93 @@
         
         free(vfs_data->files);
+
+        while (!list_empty(&vfs_data->passed_handles)) {
+                link_t *lnk;
+                vfs_boxed_handle_t *bh;
+                
+                lnk = list_first(&vfs_data->passed_handles);
+                list_remove(lnk);
+
+                bh = list_get_instance(lnk, vfs_boxed_handle_t, link);
+                free(bh);
+        }
 }
 
@@ -94 +113 @@
         if (vfs_data) {
                 fibril_mutex_initialize(&vfs_data->lock);
+                fibril_condvar_initialize(&vfs_data->cv);
+                list_initialize(&vfs_data->passed_handles);
                 vfs_data->files = NULL;
         }
@@ -331 +352 @@
         vfs_file_t *donor_file = NULL;
         vfs_file_t *acceptor_file = NULL;
+        vfs_boxed_handle_t *bh;
         int acceptor_fd;
+
+        acceptor_data = async_get_client_data_by_hash(acceptor_hash);
+        if (!acceptor_data)
+                return;
+
+        bh = malloc(sizeof(vfs_boxed_handle_t));
+        assert(bh);
+
+        link_initialize(&bh->link);
+        bh->handle = -1;
 
         donor_data = async_get_client_data_by_hash(donor_hash);
         if (!donor_data)
-                return;
-        acceptor_data = async_get_client_data_by_hash(acceptor_hash);
-        if (!acceptor_data)
                 goto out;
 
@@ -347 +376 @@
         if (acceptor_fd < 0)
                 goto out;
+
+        bh->handle = acceptor_fd;
 
         /*
@@ -364 +395 @@
 
 out:
+        fibril_mutex_lock(&acceptor_data->lock);
+        list_append(&bh->link, &acceptor_data->passed_handles);
+        fibril_condvar_broadcast(&acceptor_data->cv);
+        fibril_mutex_unlock(&acceptor_data->lock);
+
         if (donor_data)
                 async_put_client_data_by_hash(donor_hash);
@@ -372 +408 @@
         if (acceptor_file)
                 _vfs_file_put(acceptor_data, acceptor_file);
+
+}
+
+int vfs_wait_handle_internal(void)
+{
+        vfs_client_data_t *vfs_data = VFS_DATA; 
+        int fd;
+        
+        fibril_mutex_lock(&vfs_data->lock);
+        while (list_empty(&vfs_data->passed_handles))
+                fibril_condvar_wait(&vfs_data->cv, &vfs_data->lock);
+        link_t *lnk = list_first(&vfs_data->passed_handles);
+        list_remove(lnk);
+        fibril_mutex_unlock(&vfs_data->lock);
+
+        vfs_boxed_handle_t *bh = list_get_instance(lnk, vfs_boxed_handle_t, link);
+        fd = bh->handle;
+        free(bh);
+
+        return fd;
 }
 

uspace/srv/vfs/vfs_ops.c

@@ -1276 +1276 @@
 }
 
+void vfs_wait_handle(ipc_callid_t rid, ipc_call_t *request)
+{
+        int fd = vfs_wait_handle_internal();
+        async_answer_1(rid, EOK, fd);
+}
+
 /**
  * @}