Changeset 79ae36dd in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2011-06-08T19:01:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eff68e

Parents:

764d71e

Message:

new async framework with integrated exchange tracking

• strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
  • each IPC connection is represented by an async_sess_t structure
  • each IPC exchange is represented by an async_exch_t structure
  • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
• async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
• IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
• IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
• IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
• console routines in libc have been rewritten for better abstraction
• additional use for libc-private header files (FILE structure opaque to the client)
• various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)

File:

• uspace/srv/vfs/vfs_file.c (modified) (2 diffs)

uspace/srv/vfs/vfs_file.c

@@ -45 +45 @@
 #include "vfs.h"
 
-#define VFS_DATA        ((vfs_client_data_t *) async_client_data_get())
+#define VFS_DATA        ((vfs_client_data_t *) async_get_client_data())
 #define FILES           (VFS_DATA->files)
 
@@ -110 +110 @@
 static int vfs_file_close_remote(vfs_file_t *file)
 {
+        assert(!file->refcnt);
+        
+        async_exch_t *exch = vfs_exchange_grab(file->node->fs_handle);
+        
         ipc_call_t answer;
-        aid_t msg;
+        aid_t msg = async_send_2(exch, VFS_OUT_CLOSE, file->node->devmap_handle,
+            file->node->index, &answer);
+        
+        vfs_exchange_release(exch);
+        
         sysarg_t rc;
-        int phone;
-
-        assert(!file->refcnt);
-
-        phone = vfs_grab_phone(file->node->fs_handle);
-        msg = async_send_2(phone, VFS_OUT_CLOSE, file->node->devmap_handle,
-            file->node->index, &answer);
         async_wait_for(msg, &rc);
-        vfs_release_phone(file->node->fs_handle, phone);
-
+        
         return IPC_GET_ARG1(answer);
 }
-
 
 /** Increment reference count of VFS file structure.