Changeset 9b1baac in mainline for uspace/lib/c

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/lib/c

Files:

• generic/async/server.c (modified) (2 diffs)
• generic/devman.c (modified) (1 diff)
• generic/loc.c (modified) (1 diff)
• generic/ns.c (modified) (2 diffs)
• include/async.h (modified) (1 diff)
• include/ipc/ns.h (modified) (1 diff)
• include/ns.h (modified) (1 diff)

uspace/lib/c/generic/async/server.c

@@ -1317 +1317 @@
  * Ask through phone for a new connection to some service.
  *
- * @param exch Exchange for sending the message.
- * @param arg1 User defined argument.
- * @param arg2 User defined argument.
- * @param arg3 User defined argument.
+ * @param exch  Exchange for sending the message.
+ * @param iface Callback interface.
+ * @param arg2  User defined argument.
+ * @param arg3  User defined argument.
  *
  * @return Zero on success or an error code.
  *
  */
-errno_t async_connect_to_me(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
+errno_t async_connect_to_me(async_exch_t *exch, iface_t iface, sysarg_t arg2,
     sysarg_t arg3)
 {
@@ -1332 +1332 @@
 
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3,
+        aid_t req = async_send_3(exch, IPC_M_CONNECT_TO_ME, iface, arg2, arg3,
             &answer);
 

uspace/lib/c/generic/devman.c

@@ -192 +192 @@
 
         exch = devman_exchange_begin(INTERFACE_DDF_DRIVER);
-        async_connect_to_me(exch, 0, 0, 0);
+        async_connect_to_me(exch, INTERFACE_ANY, 0, 0);
         devman_exchange_end(exch);
 

uspace/lib/c/generic/loc.c

@@ -255 +255 @@
         }
 
-        async_connect_to_me(exch, 0, 0, 0);
+        async_connect_to_me(exch, INTERFACE_ANY, 0, 0);
 
         /*

uspace/lib/c/generic/ns.c

@@ -46 +46 @@
 static async_sess_t *sess_ns = NULL;
 
-errno_t service_register(service_t service)
-{
-        errno_t retval;
+errno_t service_register(service_t service, iface_t iface,
+    async_port_handler_t handler, void *data)
+{
+        async_sess_t *sess = ns_session_get();
+        if (sess == NULL)
+                return EIO;
+
+        port_id_t port;
+        errno_t rc = async_create_port(iface, handler, data, &port);
+        if (rc != EOK)
+                return rc;
+
+        async_exch_t *exch = async_exchange_begin(sess);
+
         ipc_call_t answer;
-
-        async_sess_t *sess = ns_session_get();
-        if (sess == NULL)
-                return EIO;
-
-        async_exch_t *exch = async_exchange_begin(sess);
-        aid_t req = async_send_1(exch, NS_REGISTER, service, &answer);
-        errno_t rc = async_connect_to_me(exch, 0, service, 0);
+        aid_t req = async_send_2(exch, NS_REGISTER, service, iface, &answer);
+        rc = async_connect_to_me(exch, iface, service, 0);
 
         async_exchange_end(exch);
@@ -66 +71 @@
         }
 
+        errno_t retval;
+        async_wait_for(req, &retval);
+        return rc;
+}
+
+errno_t service_register_broker(service_t service, async_port_handler_t handler,
+    void *data)
+{
+        async_set_fallback_port_handler(handler, data);
+
+        async_sess_t *sess = ns_session_get();
+        if (sess == NULL)
+                return EIO;
+
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, NS_REGISTER_BROKER, service, &answer);
+        errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, service, 0);
+
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+
+        errno_t retval;
         async_wait_for(req, &retval);
         return rc;

uspace/lib/c/include/async.h

@@ -342 +342 @@
 extern async_sess_t *async_connect_kbox(task_id_t);
 
-extern errno_t async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t);
+extern errno_t async_connect_to_me(async_exch_t *, iface_t, sysarg_t, sysarg_t);
 
 extern errno_t async_hangup(async_sess_t *);

uspace/lib/c/include/ipc/ns.h

@@ -41 +41 @@
         NS_PING = IPC_FIRST_USER_METHOD,
         NS_REGISTER,
+        NS_REGISTER_BROKER,
         NS_TASK_WAIT,
         NS_ID_INTRO,

uspace/lib/c/include/ns.h

@@ -40 +40 @@
 #include <async.h>
 
-extern errno_t service_register(service_t);
+extern errno_t service_register(service_t, iface_t, async_port_handler_t,
+    void *);
+extern errno_t service_register_broker(service_t, async_port_handler_t, void *);
 extern async_sess_t *service_connect(service_t, iface_t, sysarg_t);
 extern async_sess_t *service_connect_blocking(service_t, iface_t, sysarg_t);