Changeset a92da0a in mainline

Timestamp:

2007-12-23T21:46:52Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7dab6b8

Parents:

a55d5f9f

Message:

Reimplement VFS_READ using IPC_M_DATA_READ.

Location:

uspace

Files:

• lib/libc/generic/ipc.c (modified) (2 diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (3 diffs)
• srv/vfs/vfs_read.c (modified) (3 diffs)

uspace/lib/libc/generic/ipc.c

@@ -690 +690 @@
  * @param callid        Storage where the hash of the IPC_M_DATA_READ call will
  *                      be stored.
- * @param size          Storage where the maximum size will be stored.
+ * @param size          Storage where the maximum size will be stored. Can be
+ *                      NULL.
  *
  * @return              Non-zero on success, zero on failure.
@@ -703 +704 @@
         if (IPC_GET_METHOD(data) != IPC_M_DATA_READ)
                 return 0;
-        assert(size);
-        *size = (size_t) IPC_GET_ARG2(data);
+        if (size)
+                *size = (size_t) IPC_GET_ARG2(data);
         return 1;
 }

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -283 +283 @@
         unsigned long index = IPC_GET_ARG2(*request);
         off_t pos = IPC_GET_ARG3(*request);
-        size_t size = IPC_GET_ARG4(*request);
 
         /*
@@ -298 +297 @@
 
         /*
-         * Receive the communication area.
+         * Receive the read request.
          */
         ipc_callid_t callid;
-        ipc_call_t call;
-        callid = async_get_call(&call);
-        if (IPC_GET_METHOD(call) != IPC_M_AS_AREA_SEND) {
+        size_t size;
+        if (!ipc_data_read_receive(&callid, size)) {
                 ipc_answer_0(callid, EINVAL);   
                 ipc_answer_0(rid, EINVAL);
@@ -309 +307 @@
         }
 
-        int flags = IPC_GET_ARG3(call);
-        if (!(flags & AS_AREA_WRITE)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        size_t sz = IPC_GET_ARG2(call);
-        uint8_t *buf = as_get_mappable_page(sz);
-        if (!buf) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        ipc_answer_1(callid, EOK, buf);         /* commit to share the area */
-
         size_t bytes = max(0, min(dentry->size - pos, size));
-        memcpy(buf, dentry->data + pos, bytes);
-
-        (void) as_area_destroy(buf);
-
-        ipc_answer_1(rid, EOK, bytes);
+        (void) ipc_data_read_deliver(callid, dentry->data + pos, bytes);
 }
 

uspace/srv/vfs/vfs_read.c

@@ -54 +54 @@
          */
 
-        /*
-         * Because we don't support the receive analogy of IPC_M_DATA_SEND,
-         * VFS_READ is emulutating its behavior via sharing an address space
-         * area.
-         */
-
         int fd = IPC_GET_ARG1(*request);
-        size_t size = IPC_GET_ARG2(*request);
 
         /*
@@ -73 +66 @@
 
         /*
-         * Now we need to receive a call with client's address space area.
+         * Now we need to receive a call with client's IPC_M_DATA_READ request.
          */
         ipc_callid_t callid;
-        ipc_call_t call;
-        callid = async_get_call(&call);
-        if (IPC_GET_METHOD(call) != IPC_M_AS_AREA_SEND) {
+        if (!ipc_data_read_receive(&callid, NULL)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -91 +82 @@
         aid_t msg;
         ipc_call_t answer;
-        msg = async_send_4(fs_phone, VFS_READ, file->node->dev_handle,
-            file->node->index, file->pos, size, &answer);
+        msg = async_send_3(fs_phone, VFS_READ, file->node->dev_handle,
+            file->node->index, file->pos, &answer);
         
         /*
-         * Forward the address space area offer to the destination FS server.
-         * The call will be routed as if sent by ourselves.
+         * Forward the IPC_M_DATA_READ request to the destination FS server.
+         * The call will be routed as if sent by ourselves. Note that call
+         * arguments are immutable in this case so we don't have to bother.
          */
-        ipc_forward_fast(callid, fs_phone, IPC_GET_METHOD(call),
-            IPC_GET_ARG1(call), 0, IPC_FF_ROUTE_FROM_ME);
+        ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
 
         vfs_release_phone(fs_phone);