Changeset 8b655705 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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 mainline changes.

File:

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

uspace/srv/vfs/vfs.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <async.h>
 #include <errno.h>
@@ -47 +47 @@
 #include "vfs.h"
 
-#define NAME "vfs"
+#define NAME  "vfs"
 
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall)
@@ -57 +57 @@
          * This call needs to be answered.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
-        /*
-         * Here we enter the main connection fibril loop.
-         * The logic behind this loop and the protocol is that we'd like to keep
-         * each connection open until the client hangs up. When the client hangs
-         * up, we will free its VFS state. The act of hanging up the connection
-         * by the client is equivalent to client termination because we cannot
-         * distinguish one from the other. On the other hand, the client can
-         * hang up arbitrarily if it has no open files and reestablish the
-         * connection later.
-         */
         while (keep_on_going) {
                 ipc_call_t call;
@@ -129 +119 @@
                         vfs_dup(callid, &call);
                 default:
-                        ipc_answer_0(callid, ENOTSUP);
+                        async_answer_0(callid, ENOTSUP);
                         break;
                 }
         }
-        
-        vfs_files_done();
+
+        /*
+         * Open files for this client will be cleaned up when its last
+         * connection fibril terminates.
+         */
 }
 
@@ -166 +159 @@
         
         /*
+         * Set client data constructor and destructor.
+         */
+        async_set_client_data_constructor(vfs_client_data_create);
+        async_set_client_data_destructor(vfs_client_data_destroy);
+
+        /*
          * Set a connection handling function/fibril.
          */
@@ -173 +172 @@
          * Register at the naming service.
          */
-        sysarg_t phonead;
-        ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, 0, &phonead);
+        if (service_register(SERVICE_VFS) != EOK) {
+                printf("%s: Cannot register VFS service\n", NAME);
+                return EINVAL;
+        }
         
         /*