Changeset 2595dab in mainline for uspace/lib/libc/generic/vfs/vfs.c

Timestamp:

2009-06-03T19:26:28Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d00ae4c

Parents:

ca3ba3a

Message:

I/O subsystem overhaul:

• add more POSIX-like file and stream functions (with real functionality of stdin, stdout, stderr)
• cleanup console access methods (now generic to any console-like device)
• remove unsafe stream functions
• add special open_node(), fd_node(), fd_phone() (file) and fopen_node(), fnode(), fphone() (stream) functions for HelenOS-specific I/O operations

File:

• uspace/lib/libc/generic/vfs/vfs.c (modified) (6 diffs)

uspace/lib/libc/generic/vfs/vfs.c

@@ -50 +50 @@
 #include <string.h>
 #include <devmap.h>
-#include "../../../srv/vfs/vfs.h"
-
-int vfs_phone = -1;
-futex_t vfs_phone_futex = FUTEX_INITIALIZER;
-
-futex_t cwd_futex = FUTEX_INITIALIZER;
+#include <ipc/vfs.h>
+#include <ipc/devmap.h>
+
+static int vfs_phone = -1;
+static futex_t vfs_phone_futex = FUTEX_INITIALIZER;
+static futex_t cwd_futex = FUTEX_INITIALIZER;
+
 DIR *cwd_dir = NULL;
 char *cwd_path = NULL;
@@ -211 +212 @@
         futex_up(&vfs_phone_futex);
         free(pa);
-
+        
         if (rc != EOK)
             return (int) rc;
+        
         return (int) IPC_GET_ARG1(answer);
 }
@@ -220 +222 @@
 {
         return _open(path, L_FILE, oflag);
+}
+
+int open_node(fs_node_t *node, int oflag)
+{
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        ipc_call_t answer;
+        aid_t req = async_send_4(vfs_phone, VFS_OPEN_NODE, node->fs_handle,
+            node->dev_handle, node->index, oflag, &answer);
+        
+        ipcarg_t rc;
+        async_wait_for(req, &rc);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        
+        if (rc != EOK)
+            return (int) rc;
+        
+        return (int) IPC_GET_ARG1(answer);
 }
 
@@ -290 +313 @@
         else
                 return -1;
+}
+
+int fd_phone(int fildes)
+{
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        ipcarg_t device;
+        ipcarg_t rc = async_req_1_1(vfs_phone, VFS_DEVICE, fildes, &device);
+        
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        
+        if (rc != EOK)
+                return -1;
+        
+        return devmap_device_connect((dev_handle_t) device, 0);
+}
+
+void fd_node(int fildes, fs_node_t *node)
+{
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        ipcarg_t fs_handle;
+        ipcarg_t dev_handle;
+        ipcarg_t index;
+        ipcarg_t rc = async_req_1_3(vfs_phone, VFS_NODE, fildes, &fs_handle,
+            &dev_handle, &index);
+        
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        
+        if (rc == EOK) {
+                node->fs_handle = (fs_handle_t) fs_handle;
+                node->dev_handle = (dev_handle_t) dev_handle;
+                node->index = (fs_index_t) index;
+        } else {
+                node->fs_handle = 0;
+                node->dev_handle = 0;
+                node->index = 0;
+        }
+}
+
+int fsync(int fildes)
+{
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        ipcarg_t rc = async_req_1_0(vfs_phone, VFS_SYNC, fildes);
+        
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        
+        return (int) rc;
 }
 
@@ -387 +468 @@
         futex_up(&vfs_phone_futex);
         free(pa);
-        return rc; 
+        return rc;
 }
 
@@ -417 +498 @@
         futex_up(&vfs_phone_futex);
         free(pa);
-        return rc; 
+        return rc;
 }