Changeset 4687fcd4 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2011-01-29T10:19:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

72e19f50

Parents:

67a1b78 (diff), a09128c (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:

Changes from devel, break stuff.

File:

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

uspace/srv/vfs/vfs.c

@@ -59 +59 @@
         ipc_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;
@@ -133 +123 @@
                 }
         }
-        
-        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);
+        ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, 0, NULL, NULL);
         
         /*