Changeset 368ee04 in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/srv/vfs/vfs_file.c (modified) (17 diffs)

uspace/srv/vfs/vfs_file.c

@@ -45 +45 @@
 #include <adt/list.h>
 #include <task.h>
+#include <vfs/vfs.h>
 #include "vfs.h"
 
@@ -59 +60 @@
 typedef struct {
         link_t link;
-        int handle;
+        vfs_node_t *node;
+        int permissions;
 } vfs_boxed_handle_t;
 
@@ -177 +179 @@
                  * endpoint FS and drop our reference to the underlying VFS node.
                  */
-                rc = vfs_file_close_remote(file);
-                vfs_node_delref(file->node);
+                
+                if (file->node != NULL) {
+                        if (file->open_read || file->open_write) {
+                                rc = vfs_file_close_remote(file);
+                        }
+                        vfs_node_delref(file->node);
+                }
                 free(file);
         }
@@ -185 +192 @@
 }
 
-static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, bool desc)
+static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc)
 {
         if (!vfs_files_init(vfs_data))
@@ -205 +212 @@
                         }
                         
+                        
                         memset(vfs_data->files[i], 0, sizeof(vfs_file_t));
-                        fibril_mutex_initialize(&vfs_data->files[i]->lock);
+                        
+                        fibril_mutex_initialize(&vfs_data->files[i]->_lock);
+                        fibril_mutex_lock(&vfs_data->files[i]->_lock);
                         vfs_file_addref(vfs_data, vfs_data->files[i]);
+                        
+                        *file = vfs_data->files[i];
+                        vfs_file_addref(vfs_data, *file);
+                        
                         fibril_mutex_unlock(&vfs_data->lock);
                         return (int) i;
@@ -231 +245 @@
 /** Allocate a file descriptor.
  *
+ * @param file Is set to point to the newly created file structure. Must be put afterwards.
  * @param desc If true, look for an available file descriptor
  *             in a descending order.
@@ -237 +252 @@
  *         code.
  */
-int vfs_fd_alloc(bool desc)
-{
-        return _vfs_fd_alloc(VFS_DATA, desc);
+int vfs_fd_alloc(vfs_file_t **file, bool desc)
+{
+        return _vfs_fd_alloc(VFS_DATA, file, desc);
 }
 
@@ -289 +304 @@
 
         fibril_mutex_lock(&VFS_DATA->lock);     
-        if ((fd < 0) || (fd >= MAX_OPEN_FILES) || (FILES[fd] != NULL)) {
+        if ((fd < 0) || (fd >= MAX_OPEN_FILES)) {
                 fibril_mutex_unlock(&VFS_DATA->lock);
-                return EINVAL;
+                return EBADF;
+        }
+        if (FILES[fd] != NULL) {
+                fibril_mutex_unlock(&VFS_DATA->lock);
+                return EEXIST;
         }
         
@@ -299 +318 @@
         
         return EOK;
+}
+
+static void _vfs_file_put(vfs_client_data_t *vfs_data, vfs_file_t *file)
+{
+        fibril_mutex_unlock(&file->_lock);
+        
+        fibril_mutex_lock(&vfs_data->lock);
+        vfs_file_delref(vfs_data, file);
+        fibril_mutex_unlock(&vfs_data->lock);
 }
 
@@ -312 +340 @@
                         vfs_file_addref(vfs_data, file);
                         fibril_mutex_unlock(&vfs_data->lock);
+                        
+                        fibril_mutex_lock(&file->_lock);
+                        if (file->node == NULL) {
+                                _vfs_file_put(vfs_data, file);
+                                return NULL;
+                        }
+                        assert(file != NULL);
+                        assert(file->node != NULL);
                         return file;
                 }
@@ -331 +367 @@
 }
 
-static void _vfs_file_put(vfs_client_data_t *vfs_data, vfs_file_t *file)
-{
-        fibril_mutex_lock(&vfs_data->lock);
-        vfs_file_delref(vfs_data, file);
-        fibril_mutex_unlock(&vfs_data->lock);
-}
-
 /** Stop using a file structure.
  *
@@ -347 +376 @@
 }
 
-void vfs_pass_handle(task_id_t donor_id, task_id_t acceptor_id, int donor_fd)
+void vfs_op_pass_handle(task_id_t donor_id, task_id_t acceptor_id, int donor_fd)
 {
         vfs_client_data_t *donor_data = NULL;
         vfs_client_data_t *acceptor_data = NULL;
         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_id(acceptor_id);
@@ -364 +391 @@
 
         link_initialize(&bh->link);
-        bh->handle = -1;
+        bh->node = NULL;
 
         donor_data = async_get_client_data_by_id(donor_id);
@@ -373 +400 @@
         if (!donor_file)
                 goto out;
-
-        acceptor_fd = _vfs_fd_alloc(acceptor_data, false);
-        if (acceptor_fd < 0)
-                goto out;
-
-        bh->handle = acceptor_fd;
 
         /*
@@ -384 +405 @@
          */
         vfs_node_addref(donor_file->node);
-        (void) vfs_open_node_remote(donor_file->node);
-
-        acceptor_file = _vfs_file_get(acceptor_data, acceptor_fd);
-        assert(acceptor_file);
-
-        /*
-         * Inherit attributes from the donor.
-         */
-        acceptor_file->node = donor_file->node;
-        acceptor_file->append = donor_file->append;
-        acceptor_file->pos = donor_file->pos;
+        bh->node = donor_file->node;
+        bh->permissions = donor_file->permissions;
 
 out:
@@ -408 +420 @@
         if (donor_file)
                 _vfs_file_put(donor_data, donor_file);
-        if (acceptor_file)
-                _vfs_file_put(acceptor_data, acceptor_file);
-
-}
-
-int vfs_wait_handle_internal(void)
+}
+
+int vfs_wait_handle_internal(bool high_fd)
 {
         vfs_client_data_t *vfs_data = VFS_DATA; 
-        int fd;
         
         fibril_mutex_lock(&vfs_data->lock);
@@ -426 +434 @@
 
         vfs_boxed_handle_t *bh = list_get_instance(lnk, vfs_boxed_handle_t, link);
-        fd = bh->handle;
+
+        vfs_file_t *file;
+        int fd = _vfs_fd_alloc(vfs_data, &file, high_fd);
+        if (fd < 0) {
+                vfs_node_delref(bh->node);
+                free(bh);
+                return fd;
+        }
+        
+        file->node = bh->node;
+        file->permissions = bh->permissions;
+        vfs_file_put(file);
         free(bh);
-
         return fd;
 }