Changeset e8d5f9f in mainline

Timestamp:

2011-05-31T23:11:28Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d1b3aa

Parents:

4ce90544 (diff), 25bef0ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/fs.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/tester/Makefile (modified) (1 diff)
• uspace/app/tester/tester.c (modified) (1 diff)
• uspace/app/tester/tester.h (modified) (1 diff)
• uspace/drv/rootvirt/devices.def (modified) (1 diff)
• uspace/srv/vfs/vfs.h (modified) (1 diff)
• uspace/srv/vfs/vfs_file.c (modified) (5 diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (2 diffs)

boot/Makefile.common

@@ -114 +114 @@
         rootvirt \
         test1 \
-        test2
+        test2 \
+        test3
 
 RD_DRV_CFG = 

uspace/Makefile

@@ -90 +90 @@
         drv/rootvirt \
         drv/test1 \
-        drv/test2
+        drv/test2 \
+        drv/test3
 
 ## Networking

uspace/app/tester/Makefile

@@ -53 +53 @@
         mm/malloc3.c \
         devs/devman1.c \
+        devs/devman2.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c

uspace/app/tester/tester.c

@@ -67 +67 @@
 #include "hw/misc/virtchar1.def"
 #include "devs/devman1.def"
+#include "devs/devman2.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

@@ -100 +100 @@
 extern const char *test_virtchar1(void);
 extern const char *test_devman1(void);
+extern const char *test_devman2(void);
 
 extern test_t tests[];

uspace/drv/rootvirt/devices.def

@@ -21 +21 @@
         .match_id = "virtual&test1"
 },
+{
+        .name = "test3",
+        .match_id = "virtual&test3"
+},
 #endif

uspace/srv/vfs/vfs.h

@@ -176 +176 @@
     vfs_pair_t *, ...);
 extern int vfs_open_node_internal(vfs_lookup_res_t *);
-extern int vfs_close_internal(vfs_file_t *);
 
 extern bool vfs_nodes_init(void);

uspace/srv/vfs/vfs_file.c

@@ -79 +79 @@
         for (i = 0; i < MAX_OPEN_FILES; i++) {
                 if (FILES[i]) {
-                        (void) vfs_close_internal(FILES[i]);
                         (void) vfs_fd_free(i);
                 }
@@ -108 +107 @@
 }
 
+/** Close the file in the endpoint FS server. */
+static int vfs_file_close_remote(vfs_file_t *file)
+{
+        ipc_call_t answer;
+        aid_t msg;
+        sysarg_t rc;
+        int phone;
+
+        assert(!file->refcnt);
+
+        phone = vfs_grab_phone(file->node->fs_handle);
+        msg = async_send_2(phone, VFS_OUT_CLOSE, file->node->devmap_handle,
+            file->node->index, &answer);
+        async_wait_for(msg, &rc);
+        vfs_release_phone(file->node->fs_handle, phone);
+
+        return IPC_GET_ARG1(answer);
+}
+
+
 /** Increment reference count of VFS file structure.
  *
@@ -125 +144 @@
  *                      decremented.
  */
-static void vfs_file_delref(vfs_file_t *file)
-{
+static int vfs_file_delref(vfs_file_t *file)
+{
+        int rc = EOK;
+
         assert(fibril_mutex_is_locked(&VFS_DATA->lock));
 
         if (file->refcnt-- == 1) {
                 /*
-                 * Lost the last reference to a file, need to drop our reference
-                 * to the underlying VFS node.
+                 * Lost the last reference to a file, need to close it in the
+                 * endpoint FS and drop our reference to the underlying VFS node.
                  */
+                rc = vfs_file_close_remote(file);
                 vfs_node_delref(file->node);
                 free(file);
         }
+
+        return rc;
 }
 
@@ -201 +225 @@
 int vfs_fd_free(int fd)
 {
+        int rc;
+
         if (!vfs_files_init())
                 return ENOMEM;
@@ -210 +236 @@
         }
         
-        vfs_file_delref(FILES[fd]);
+        rc = vfs_file_delref(FILES[fd]);
         FILES[fd] = NULL;
         fibril_mutex_unlock(&VFS_DATA->lock);
         
-        return EOK;
+        return rc;
 }
 

uspace/srv/vfs/vfs_ops.c

@@ -717 +717 @@
 }
 
-int vfs_close_internal(vfs_file_t *file)
-{
-        /*
-         * Lock the open file structure so that no other thread can manipulate
-         * the same open file at a time.
-         */
-        fibril_mutex_lock(&file->lock);
-        
-        if (file->refcnt <= 1) {
-                /* Only close the file on the destination FS server
-                   if there are no more file descriptors (except the
-                   present one) pointing to this file. */
-                
-                int fs_phone = vfs_grab_phone(file->node->fs_handle);
-                
-                /* Make a VFS_OUT_CLOSE request at the destination FS server. */
-                aid_t msg;
-                ipc_call_t answer;
-                msg = async_send_2(fs_phone, VFS_OUT_CLOSE,
-                    file->node->devmap_handle, file->node->index, &answer);
-                
-                /* Wait for reply from the FS server. */
-                sysarg_t rc;
-                async_wait_for(msg, &rc);
-                
-                vfs_release_phone(file->node->fs_handle, fs_phone);
-                fibril_mutex_unlock(&file->lock);
-                
-                return IPC_GET_ARG1(answer);
-        }
-        
-        fibril_mutex_unlock(&file->lock);
-        return EOK;
-}
-
 void vfs_close(ipc_callid_t rid, ipc_call_t *request)
 {
         int fd = IPC_GET_ARG1(*request);
-        
-        /* Lookup the file structure corresponding to the file descriptor. */
-        vfs_file_t *file = vfs_file_get(fd);
-        if (!file) {
-                async_answer_0(rid, ENOENT);
-                return;
-        }
-        
-        int ret = vfs_close_internal(file);
-        if (ret != EOK)
-                async_answer_0(rid, ret);
-        
-        vfs_file_put(file);
+        int ret;
+        
         ret = vfs_fd_free(fd);
         async_answer_0(rid, ret);
@@ -1369 +1323 @@
         fibril_mutex_lock(&oldfile->lock);
         
-        /* Lookup an open file structure possibly corresponding to newfd. */
-        vfs_file_t *newfile = vfs_file_get(newfd);
-        if (newfile) {
-                /* Close the originally opened file. */
-                int ret = vfs_close_internal(newfile);
-                if (ret != EOK) {
-                        fibril_mutex_unlock(&oldfile->lock);
-                        vfs_file_put(oldfile);
-                        vfs_file_put(newfile);
-                        async_answer_0(rid, ret);
-                        return;
-                }
-                
-                ret = vfs_fd_free(newfd);
-                if (ret != EOK) {
-                        fibril_mutex_unlock(&oldfile->lock);
-                        vfs_file_put(oldfile);
-                        vfs_file_put(newfile);
-                        async_answer_0(rid, ret);
-                        return;
-                }
-                vfs_file_put(newfile);
-        }
+        /* Make sure newfd is closed. */
+        (void) vfs_fd_free(newfd);
         
         /* Assign the old file to newfd. */