Changeset 42a619b in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2011-08-19T08:58:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7dcb7981, 903bac0a, c2cf033

Parents:

ef7052ec (diff), d894fbd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/camp2011.

File:

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

uspace/srv/vfs/vfs.c

@@ -37 +37 @@
 
 #include <ipc/services.h>
+#include <abi/ipc/event.h>
+#include <event.h>
 #include <ns.h>
 #include <async.h>
@@ -45 +47 @@
 #include <as.h>
 #include <atomic.h>
+#include <vfs/vfs.h>
 #include "vfs.h"
 
@@ -80 +83 @@
                         vfs_open(callid, &call);
                         break;
-                case VFS_IN_OPEN_NODE:
-                        vfs_open_node(callid, &call);
-                        break;
                 case VFS_IN_CLOSE:
                         vfs_close(callid, &call);
@@ -118 +118 @@
                 case VFS_IN_DUP:
                         vfs_dup(callid, &call);
+                        break;
+                case VFS_IN_WAIT_HANDLE:
+                        vfs_wait_handle(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);
@@ -128 +132 @@
          * connection fibril terminates.
          */
+}
+
+enum {
+        VFS_TASK_STATE_CHANGE
+};
+
+static void notification_received(ipc_callid_t callid, ipc_call_t *call)
+{
+        switch (IPC_GET_IMETHOD(*call)) {
+        case VFS_TASK_STATE_CHANGE:
+                if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
+                        vfs_pass_handle(IPC_GET_ARG4(*call),
+                            IPC_GET_ARG5(*call), (int) IPC_GET_ARG2(*call));
+                break;
+        default:
+                break;
+        }
 }
 
@@ -170 +191 @@
 
         /*
+         * 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.
          */