Changeset ee1b8ca in mainline

Timestamp:

2007-12-25T20:02:25Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c1bf5cb

Parents:

1356a04c

Message:

VFS and TMPFS support for VFS_WRITE.

Location:

uspace/srv

Files:

• fs/tmpfs/tmpfs.h (modified) (1 diff)
• fs/tmpfs/tmpfs_ops.c (modified) (1 diff)
• vfs/Makefile (modified) (1 diff)
• vfs/vfs.c (modified) (1 diff)
• vfs/vfs.h (modified) (1 diff)
• vfs/vfs_rdwr.c (moved) (moved from uspace/srv/vfs/vfs_read.c ) (5 diffs)

uspace/srv/fs/tmpfs/tmpfs.h

@@ -63 +63 @@
 extern void tmpfs_lookup(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_read(ipc_callid_t, ipc_call_t *);
+extern void tmpfs_write(ipc_callid_t, ipc_call_t *);
 
 #endif

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -316 +316 @@
 }
 
+void tmpfs_write(ipc_callid_t rid, ipc_call_t *request)
+{
+        int dev_handle = IPC_GET_ARG1(*request);
+        unsigned long index = IPC_GET_ARG2(*request);
+        off_t pos = IPC_GET_ARG3(*request);
+
+        /*
+         * Lookup the respective dentry.
+         */
+        link_t *hlp;
+        hlp = hash_table_find(&dentries, &index);
+        if (!hlp) {
+                ipc_answer_0(rid, ENOENT);
+                return;
+        }
+        tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
+            dh_link);
+
+        /*
+         * Receive the write request.
+         */
+        ipc_callid_t callid;
+        size_t size;
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
+                ipc_answer_0(callid, EINVAL);   
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        /*
+         * At this point, we are deliberately extremely straightforward and
+         * simply realloc the contents of the file on every write. In the end,
+         * the situation might not be as bad as it may look: our heap allocator
+         * can save us and just grow the block whenever possible.
+         */
+        void *newdata = realloc(dentry->data, size);
+        if (!newdata) {
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_1(rid, EOK, 0);
+                return;
+        }
+        dentry->size = size;
+        dentry->data = newdata;
+        (void) ipc_data_write_deliver(callid, dentry->data + pos, size);
+
+        /*
+         * Answer the VFS_WRITE call.
+         */
+        ipc_answer_1(rid, EOK, size);
+}
+
 /**
  * @}

uspace/srv/vfs/Makefile

@@ -49 +49 @@
         vfs_mount.c \
         vfs_open.c \
-        vfs_read.c \
+        vfs_rdwr.c \
         vfs_unlink.c
 

uspace/srv/vfs/vfs.c

@@ -97 +97 @@
                         vfs_read(callid, &call);
                         break;
+                case VFS_WRITE:
+                        vfs_write(callid, &call);
+                        break;
                 case VFS_UNMOUNT:
                 case VFS_CREATE:
                 case VFS_CLOSE:
-                case VFS_WRITE:
                 case VFS_SEEK:
                 case VFS_UNLINK:

uspace/srv/vfs/vfs.h

@@ -200 +200 @@
 extern void vfs_open(ipc_callid_t, ipc_call_t *);
 extern void vfs_read(ipc_callid_t, ipc_call_t *);
+extern void vfs_write(ipc_callid_t, ipc_call_t *);
 
 #endif

uspace/srv/vfs/vfs_rdwr.c

@@ -32 +32 @@
 
 /**
- * @file        vfs_read.c
+ * @file        vfs_rdwr.c
  * @brief
  */
@@ -41 +41 @@
 #include <errno.h>
 
-void vfs_read(ipc_callid_t rid, ipc_call_t *request)
+static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)
 {
 
@@ -66 +66 @@
 
         /*
-         * Now we need to receive a call with client's IPC_M_DATA_READ request.
+         * Now we need to receive a call with client's
+         * IPC_M_DATA_READ/IPC_M_DATA_WRITE request.
          */
         ipc_callid_t callid;
-        if (!ipc_data_read_receive(&callid, NULL)) {
+        int res;
+        if (read)
+                res = ipc_data_read_receive(&callid, NULL);
+        else 
+                res = ipc_data_write_receive(&callid, NULL, NULL);
+        if (!res) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -78 +84 @@
         
         /*
-         * Make a VFS_READ request at the destination FS server.
+         * Make a VFS_READ/VFS_WRITE request at the destination FS server.
          */
         aid_t msg;
         ipc_call_t answer;
-        msg = async_send_3(fs_phone, VFS_READ, file->node->dev_handle,
-            file->node->index, file->pos, &answer);
+        msg = async_send_3(fs_phone, IPC_GET_METHOD(*request),
+            file->node->dev_handle, file->node->index, file->pos, &answer);
         
         /*
-         * 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.
+         * Forward the IPC_M_DATA_READ/IPC_M_DATA_WRITE 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, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
@@ -113 +120 @@
 }
 
+
+void vfs_read(ipc_callid_t rid, ipc_call_t *request)
+{
+        vfs_rdwr(rid, request, true);
+}
+
+void vfs_write(ipc_callid_t rid, ipc_call_t *request)
+{
+        vfs_rdwr(rid, request, false);
+}
+
 /**
  * @}