Changeset 79ae36dd in mainline for uspace/srv/fs/ext2fs/ext2fs.c

Timestamp:

2011-06-08T19:01:55Z (13 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/fs/ext2fs/ext2fs.c (modified) (4 diffs)

uspace/srv/fs/ext2fs/ext2fs.c

@@ -40 +40 @@
 #include "ext2fs.h"
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <errno.h>
@@ -87 +87 @@
         
         dprintf(NAME ": connection opened\n");
-        while (1) {
-                ipc_callid_t callid;
+        while (true) {
                 ipc_call_t call;
-        
-                callid = async_get_call(&call);
-                switch  (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
                         return;
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case VFS_OUT_MOUNTED:
                         ext2fs_mounted(callid, &call);
@@ -143 +143 @@
 int main(int argc, char **argv)
 {
-        int vfs_phone;
-        int rc;
-
         printf(NAME ": HelenOS EXT2 file system server\n");
-
-        vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
-        if (vfs_phone < EOK) {
+        
+        async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+            SERVICE_VFS, 0, 0);
+        if (!vfs_sess) {
                 printf(NAME ": failed to connect to VFS\n");
                 return -1;
         }
 
-        rc = ext2fs_global_init();
+        int rc = ext2fs_global_init();
         if (rc != EOK) {
                 printf(NAME ": Failed global initialization\n");
@@ -160 +158 @@
         }       
                 
-        rc = fs_register(vfs_phone, &ext2fs_reg, &ext2fs_vfs_info, ext2fs_connection);
+        rc = fs_register(vfs_sess, &ext2fs_reg, &ext2fs_vfs_info, ext2fs_connection);
         if (rc != EOK) {
                 fprintf(stdout, NAME ": Failed to register fs (%d)\n", rc);