Changeset 9b1baac in mainline for uspace/srv/vfs

Timestamp:

2018-07-18T08:35:42Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b05082

Parents:

edc64c0

Message:

ns: register service interfaces individually

Each service interface is now registered individually with the naming
service. This adds a degree of type safety, potentially allows the
individual interfaces to be implemented by independent tasks and moves
the code slightly closer to the full-fledged ports design.

Broker services (e.g. the location service) can still register a
fallback port for receiving connections to all interface types
explicitly using service_register_broker().

Location:

uspace/srv/vfs

Files:

• vfs.c (modified) (2 diffs)
• vfs_register.c (modified) (1 diff)

uspace/srv/vfs/vfs.c

@@ -117 +117 @@
 
         /*
-         * Create a port for the pager.
-         */
-        port_id_t port;
-        errno_t rc = async_create_port(INTERFACE_PAGER, vfs_pager, NULL, &port);
-        if (rc != EOK) {
-                printf("%s: Cannot create pager port: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
-        /*
-         * Set a connection handling function/fibril.
-         */
-        async_set_fallback_port_handler(vfs_connection, NULL);
-
-        /*
          * Subscribe to notifications.
          */
@@ -140 +125 @@
          * Register at the naming service.
          */
-        rc = service_register(SERVICE_VFS);
+        errno_t rc = service_register(SERVICE_VFS, INTERFACE_PAGER, vfs_pager, NULL);
         if (rc != EOK) {
-                printf("%s: Cannot register VFS service: %s\n", NAME, str_error(rc));
+                printf("%s: Cannot register VFS pager port: %s\n", NAME, str_error(rc));
+                return rc;
+        }
+
+        rc = service_register(SERVICE_VFS, INTERFACE_VFS, vfs_connection, NULL);
+        if (rc != EOK) {
+                printf("%s: Cannot register VFS file system port: %s\n", NAME, str_error(rc));
+                return rc;
+        }
+
+        rc = service_register(SERVICE_VFS, INTERFACE_VFS_DRIVER, vfs_connection, NULL);
+        if (rc != EOK) {
+                printf("%s: Cannot register VFS driver port: %s\n", NAME, str_error(rc));
                 return rc;
         }

uspace/srv/vfs/vfs_register.c

@@ -187 +187 @@
         }
 
+        /* FIXME: Work around problem with callback sessions */
+        async_sess_args_set(fs_info->sess, INTERFACE_VFS_DRIVER_CB, 0, 0);
+
         dprintf("Callback connection to FS created.\n");