Changeset ca48672 in mainline for uspace/lib/c

Timestamp:

2025-06-20T15:18:27Z (4 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

cb20b05

Parents:

3951046

Message:

loc_service_register() needs to take a port ID argument.

Location:

uspace/lib/c

Files:

• generic/async/ports.c (modified) (4 diffs)
• generic/loc.c (modified) (2 diffs)
• generic/ns.c (modified) (3 diffs)
• include/async.h (modified) (3 diffs)
• include/loc.h (modified) (2 diffs)
• test/loc.c (modified) (2 diffs)

uspace/lib/c/generic/async/ports.c

@@ -197 +197 @@
 }
 
+static bool destroy_if(ht_link_t *link, void *arg)
+{
+        port_t *port = (port_t *)arg;
+
+        hash_table_remove_item(&port->interface_hash_table, link);
+        return false;
+}
+
+static void async_delete_port(port_t *port)
+{
+        /* Destroy interfaces */
+        hash_table_apply(&port->interface_hash_table, destroy_if, NULL);
+
+        hash_table_destroy(&port->interface_hash_table);
+        free(port);
+}
+
 errno_t async_create_port_internal(iface_t iface, async_port_handler_t handler,
     void *data, port_id_t *port_id)
@@ -212 +229 @@
         interface = async_new_interface(port, iface, handler, data);
         if (interface == NULL) {
-                // XXX delete port
+                async_delete_port(port);
                 fibril_rmutex_unlock(&port_mutex);
                 return ENOMEM;
@@ -218 +235 @@
 
         *port_id = port->id;
+        fibril_rmutex_unlock(&port_mutex);
+        return EOK;
+}
+
+errno_t async_port_create_interface(port_id_t port_id, iface_t iface,
+    async_port_handler_t handler, void *data)
+{
+        ht_link_t *link;
+        port_t *port;
+        interface_t *interface;
+
+        fibril_rmutex_lock(&port_mutex);
+        link = hash_table_find(&port_hash_table, &port_id);
+        assert(link != NULL);
+        port = hash_table_get_inst(link, port_t, link);
+
+        interface = async_new_interface(port, iface, handler, data);
+        if (interface == NULL) {
+                fibril_rmutex_unlock(&port_mutex);
+                return ENOMEM;
+        }
+
         fibril_rmutex_unlock(&port_mutex);
         return EOK;
@@ -306 +345 @@
 }
 
+void async_port_destroy(port_id_t port_id)
+{
+        ht_link_t *link;
+        port_t *port;
+
+        fibril_rmutex_lock(&port_mutex);
+        link = hash_table_find(&port_hash_table, &port_id);
+        assert(link != NULL);
+        port = hash_table_get_inst(link, port_t, link);
+        async_delete_port(port);
+        fibril_rmutex_unlock(&port_mutex);
+}
+
 /** Initialize the async framework ports.
  *

uspace/lib/c/generic/loc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2007 Josef Cejka
  * All rights reserved.
@@ -258 +258 @@
  * @param srv Server object
  * @param fqsn Fully qualified service name
+ * @param portid ID of port providing the service
  * @param sid  Service ID of new service
  *
  */
 errno_t loc_service_register(loc_srv_t *srv, const char *fqsn,
-    service_id_t *sid)
+    port_id_t portid, service_id_t *sid)
 {
         async_exch_t *exch = async_exchange_begin(srv->sess);
         ipc_call_t answer;
-        aid_t req = async_send_0(exch, LOC_SERVICE_REGISTER, &answer);
+        aid_t req = async_send_1(exch, LOC_SERVICE_REGISTER, portid, &answer);
         errno_t retval = async_data_write_start(exch, fqsn, str_size(fqsn));
 

uspace/lib/c/generic/ns.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -68 +69 @@
 
         if (rc != EOK) {
+                async_port_destroy(port);
                 async_forget(req);
                 return rc;
@@ -74 +76 @@
         errno_t retval;
         async_wait_for(req, &retval);
+
+        if (rc != EOK)
+                async_port_destroy(port);
         return rc;
 }

uspace/lib/c/include/async.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
@@ -99 +100 @@
 } exch_mgmt_t;
 
+enum {
+        fallback_port_id = 0
+};
+
 /** Forward declarations */
 struct async_exch;
@@ -134 +139 @@
 extern errno_t async_create_port(iface_t, async_port_handler_t, void *,
     port_id_t *);
+extern void async_port_destroy(port_id_t);
+extern errno_t async_port_create_interface(port_id_t, iface_t,
+    async_port_handler_t, void *);
 extern void async_set_fallback_port_handler(async_port_handler_t, void *);
 extern errno_t async_create_callback_port(async_exch_t *, iface_t, sysarg_t,

uspace/lib/c/include/loc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 extern errno_t loc_server_register(const char *, loc_srv_t **);
 extern void loc_server_unregister(loc_srv_t *);
-extern errno_t loc_service_register(loc_srv_t *, const char *, service_id_t *);
+extern errno_t loc_service_register(loc_srv_t *, const char *, port_id_t,
+    service_id_t *);
 extern errno_t loc_service_unregister(loc_srv_t *, service_id_t);
 extern errno_t loc_service_add_to_cat(loc_srv_t *, service_id_t, category_id_t);

uspace/lib/c/test/loc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 
         // XXX Without a unique name this is not reentrant
-        rc = loc_service_register(sa, "test/libc-service-a", &svca);
+        rc = loc_service_register(sa, "test/libc-service-a",
+            fallback_port_id, &svca);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
         // XXX Without a unique name this is not reentrant
-        rc = loc_service_register(sb, "test/libc-service-b", &svcb);
+        rc = loc_service_register(sb, "test/libc-service-b",
+            fallback_port_id, &svcb);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);