Changeset e503517a in mainline

Timestamp:

2016-09-02T14:09:40Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c1f7a315

Parents:

42d08592

Message:

Introduce vfs_rdwr_internal()

This function can be used by the VFS itself to do read/write I/O on
client's file descriptor.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_ops.c (modified) (5 diffs)

uspace/srv/vfs/vfs.h

@@ -224 +224 @@
 extern void vfs_statfs(ipc_callid_t, ipc_call_t *);
 
+typedef struct {
+        void *buffer;
+        size_t size;
+} rdwr_io_chunk_t;
+
+extern int vfs_rdwr_internal(int, bool, rdwr_io_chunk_t *);
+
 #endif
 

uspace/srv/vfs/vfs_ops.c

@@ -734 +734 @@
 }
 
-typedef sysarg_t (* rdwr_ipc_cb_t)(async_exch_t *, vfs_file_t *, ipc_call_t *,
+typedef int (* rdwr_ipc_cb_t)(async_exch_t *, vfs_file_t *, ipc_call_t *,
     bool, void *);
 
-static sysarg_t rdwr_ipc_client(async_exch_t *exch, vfs_file_t *file,
+static int rdwr_ipc_client(async_exch_t *exch, vfs_file_t *file,
     ipc_call_t *answer, bool read, void *data)
 {
+        size_t *bytes = (size_t *) data;
+        int rc;
+
         /*
          * Make a VFS_READ/VFS_WRITE request at the destination FS server
@@ -749 +752 @@
 
         if (read) {
-                return async_data_read_forward_4_1(exch, VFS_OUT_READ,
+                rc = async_data_read_forward_4_1(exch, VFS_OUT_READ,
                     file->node->service_id, file->node->index,
                     LOWER32(file->pos), UPPER32(file->pos), answer);
         } else {
-                return async_data_write_forward_4_1(exch, VFS_OUT_WRITE,
+                rc = async_data_write_forward_4_1(exch, VFS_OUT_WRITE,
                     file->node->service_id, file->node->index,
                     LOWER32(file->pos), UPPER32(file->pos), answer);
-        }       
-}
-        
-static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read,
-    rdwr_ipc_cb_t ipc_cb, void *ipc_cb_data)
+        }
+
+        *bytes = IPC_GET_ARG1(*answer);
+        return rc;
+}
+
+static int rdwr_ipc_internal(async_exch_t *exch, vfs_file_t *file,
+    ipc_call_t *answer, bool read, void *data)
+{
+        rdwr_io_chunk_t *chunk = (rdwr_io_chunk_t *) data;
+
+        if (exch == NULL)
+                return ENOENT;
+        
+        aid_t msg = async_send_fast(exch, read ? VFS_OUT_READ : VFS_OUT_WRITE,
+            file->node->service_id, file->node->index, LOWER32(file->pos),
+            UPPER32(file->pos), answer);
+        if (msg == 0)
+                return EINVAL;
+
+        int retval = async_data_read_start(exch, chunk->buffer, chunk->size);
+        if (retval != EOK) {
+                async_forget(msg);
+                return retval;
+        }
+        
+        sysarg_t rc;
+        async_wait_for(msg, &rc);
+        
+        chunk->size = IPC_GET_ARG1(*answer); 
+
+        return (int) rc;
+}
+
+static int vfs_rdwr(int fd, bool read, rdwr_ipc_cb_t ipc_cb, void *ipc_cb_data)
 {
         /*
@@ -772 +805 @@
          */
         
-        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;
-        }
+        if (!file)
+                return ENOENT;
         
         /*
@@ -819 +848 @@
          */
         ipc_call_t answer;
-        sysarg_t rc = ipc_cb(fs_exch, file, &answer, read, ipc_cb_data);
+        int rc = ipc_cb(fs_exch, file, &answer, read, ipc_cb_data);
         
         vfs_exchange_release(fs_exch);
@@ -846 +875 @@
         vfs_file_put(file);     
 
-        /*
-         * FS server's reply is the final result of the whole operation we
-         * return to the client.
-         */
+        return rc;
+}
+        
+static void vfs_rdwr_client(ipc_callid_t rid, ipc_call_t *request, bool read)
+{
+        size_t bytes = 0;       
+        int rc = vfs_rdwr(IPC_GET_ARG1(*request), read, rdwr_ipc_client,
+            &bytes);
         async_answer_1(rid, rc, bytes);
 }
 
+int vfs_rdwr_internal(int fd, bool read, rdwr_io_chunk_t *chunk)
+{
+        return vfs_rdwr(fd, read, rdwr_ipc_internal, chunk);
+}
+
 void vfs_read(ipc_callid_t rid, ipc_call_t *request)
 {
-        vfs_rdwr(rid, request, true, rdwr_ipc_client, NULL);
+        vfs_rdwr_client(rid, request, true);
 }
 
 void vfs_write(ipc_callid_t rid, ipc_call_t *request)
 {
-        vfs_rdwr(rid, request, false, rdwr_ipc_client, NULL);
+        vfs_rdwr_client(rid, request, false);
 }