Changeset 2c2d54a in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2016-09-02T17:58:05Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c3602c4

Parents:

4bf0926e (diff), 3233adb (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/pager

File:

• uspace/srv/vfs/vfs.c (modified) (6 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 <ns.h>
 #include <async.h>
@@ -51 +54 @@
 #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;
+                }
+        }
+}
+
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -150 +175 @@
 int main(int argc, char **argv)
 {
+        int rc;
+
         printf("%s: HelenOS VFS server\n", NAME);
         
@@ -165 +192 @@
          */
         plb = as_area_create(AS_AREA_ANY, PLB_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE, AS_AREA_UNPAGED);
         if (plb == AS_MAP_FAILED) {
                 printf("%s: Cannot create address space area\n", NAME);
@@ -179 +206 @@
 
         /*
+         * 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.
          */
@@ -192 +227 @@
          * Register at the naming service.
          */
-        int rc = service_register(SERVICE_VFS);
+        rc = service_register(SERVICE_VFS);
         if (rc != EOK) {
                 printf("%s: Cannot register VFS service\n", NAME);