Changes in uspace/srv/vfs/vfs.c [c1f7a315:d60ce4a] in mainline

File:

• uspace/srv/vfs/vfs.c (modified) (8 diffs)

uspace/srv/vfs/vfs.c

@@ -37 +37 @@
 
 #include <vfs/vfs.h>
-#include <stdlib.h>
 #include <ipc/services.h>
-#include <abi/ipc/methods.h>
-#include <libarch/config.h>
+#include <abi/ipc/event.h>
+#include <event.h>
 #include <ns.h>
 #include <async.h>
@@ -54 +53 @@
 #define NAME  "vfs"
 
-static void vfs_pager(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-        async_answer_0(iid, EOK);
-
-        while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call))
-                        break;
-                
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PAGE_IN:
-                        vfs_page_in(callid, &call);
-                        break;
-                default:
-                        async_answer_0(callid, ENOTSUP);
-                        break;
-                }
-        }
-}
+enum {
+        VFS_TASK_STATE_CHANGE
+};
 
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
@@ -99 +80 @@
                         break;
                 case VFS_IN_MOUNT:
-                        vfs_mount_srv(callid, &call);
+                        vfs_mount(callid, &call);
                         break;
                 case VFS_IN_UNMOUNT:
-                        vfs_unmount_srv(callid, &call);
-                        break;
-                case VFS_IN_OPEN:
-                        vfs_open(callid, &call);
+                        vfs_unmount(callid, &call);
+                        break;
+                case VFS_IN_WALK:
+                        vfs_walk(callid, &call);
+                        break;
+                case VFS_IN_OPEN2:
+                        vfs_open2(callid, &call);
                         break;
                 case VFS_IN_CLOSE:
@@ -125 +109 @@
                         vfs_fstat(callid, &call);
                         break;
-                case VFS_IN_STAT:
-                        vfs_stat(callid, &call);
-                        break;
-                case VFS_IN_MKDIR:
-                        vfs_mkdir(callid, &call);
-                        break;
-                case VFS_IN_UNLINK:
-                        vfs_unlink(callid, &call);
+                case VFS_IN_UNLINK2:
+                        vfs_unlink2(callid, &call);
                         break;
                 case VFS_IN_RENAME:
@@ -149 +127 @@
                         vfs_get_mtab(callid, &call);
                         break;
-                case VFS_IN_STATFS:
-                        vfs_statfs(callid, &call);
-                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);
@@ -164 +139 @@
 }
 
-static void notification_handler(ipc_callid_t callid, ipc_call_t *call, void *arg)
+static void notification_received(ipc_callid_t callid, ipc_call_t *call)
 {
-        if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
-                vfs_pass_handle(
-                    (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call),
-                    IPC_GET_ARG5(*call)), call->in_task_id,
-                    (int) IPC_GET_ARG2(*call));
+        switch (IPC_GET_IMETHOD(*call)) {
+        case VFS_TASK_STATE_CHANGE:
+                if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
+                        vfs_pass_handle(
+                            (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call),
+                            IPC_GET_ARG5(*call)), call->in_task_id,
+                            (int) IPC_GET_ARG2(*call));
+                break;
+        default:
+                break;
+        }
 }
 
 int main(int argc, char **argv)
 {
-        int rc;
-
         printf("%s: HelenOS VFS server\n", NAME);
         
@@ -192 +171 @@
          */
         plb = as_area_create(AS_AREA_ANY, PLB_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE, AS_AREA_UNPAGED);
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         if (plb == AS_MAP_FAILED) {
                 printf("%s: Cannot create address space area\n", NAME);
@@ -206 +185 @@
 
         /*
-         * Create a port for the pager.
-         */
-        port_id_t port;
-        rc = async_create_port(INTERFACE_PAGER, vfs_pager, NULL, &port);
-        if (rc != EOK)
-                return rc;
-                
-        /*
          * Set a connection handling function/fibril.
          */
-        async_set_fallback_port_handler(vfs_connection, NULL);
-
-        /*
-         * Subscribe to notifications.
-         */
-        async_event_task_subscribe(EVENT_TASK_STATE_CHANGE, notification_handler,
-            NULL);
+        async_set_client_connection(vfs_connection);
+
+        /*
+         * Set notification handler and subscribe to notifications.
+         */
+        async_set_interrupt_received(notification_received);
+        event_task_subscribe(EVENT_TASK_STATE_CHANGE, VFS_TASK_STATE_CHANGE);
         
         /*
          * Register at the naming service.
          */
-        rc = service_register(SERVICE_VFS);
+        int rc = service_register(SERVICE_VFS);
         if (rc != EOK) {
                 printf("%s: Cannot register VFS service\n", NAME);