Changeset 9b1baac in mainline for uspace/srv/ns/ns.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().

File:

• uspace/srv/ns/ns.c (modified) (5 diffs)

uspace/srv/ns/ns.c

@@ -61 +61 @@
                  * Client requests to be connected to a service.
                  */
-                if (service_clonable(service)) {
-                        connect_to_clonable(service, iface, icall);
+                if (ns_service_is_clonable(service, iface)) {
+                        ns_clonable_forward(service, iface, icall);
                 } else {
-                        connect_to_service(service, iface, icall);
+                        ns_service_forward(service, iface, icall);
                 }
+
                 return;
         }
@@ -72 +73 @@
 
         while (true) {
-                process_pending_conn();
+                ns_pending_conn_process();
 
                 async_get_call(&call);
@@ -82 +83 @@
 
                 service_t service;
-                sysarg_t phone;
 
                 switch (IPC_GET_IMETHOD(call)) {
                 case NS_REGISTER:
                         service = IPC_GET_ARG1(call);
-                        phone = IPC_GET_ARG5(call);
+                        iface = IPC_GET_ARG2(call);
 
                         /*
                          * Server requests service registration.
                          */
-                        if (service_clonable(service)) {
-                                register_clonable(service, phone, &call);
+                        if (ns_service_is_clonable(service, iface)) {
+                                ns_clonable_register(&call);
                                 continue;
                         } else {
-                                retval = register_service(service, phone, &call);
+                                retval = ns_service_register(service, iface);
                         }
 
+                        break;
+                case NS_REGISTER_BROKER:
+                        service = IPC_GET_ARG1(call);
+                        retval = ns_service_register_broker(service);
                         break;
                 case NS_PING:
@@ -115 +119 @@
                         break;
                 default:
-                        printf("ns: method not supported\n");
+                        printf("%s: Method not supported (%" PRIun ")\n",
+                            NAME, IPC_GET_IMETHOD(call));
                         retval = ENOTSUP;
                         break;
@@ -130 +135 @@
         printf("%s: HelenOS IPC Naming Service\n", NAME);
 
-        errno_t rc = service_init();
+        errno_t rc = ns_service_init();
         if (rc != EOK)
                 return rc;
 
-        rc = clonable_init();
+        rc = ns_clonable_init();
         if (rc != EOK)
                 return rc;