Changeset 4c6fd56 in mainline for uspace/lib/c/generic/loc.c

Timestamp:

2023-09-16T19:58:18Z (16 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7d7f5e3

Parents:

6a0b2cc

git-author:

Jiri Svoboda <jiri@…> (2023-09-16 19:48:07)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-16 19:58:18)

Message:

loc_server_register() should be callable more than once (API only)

Now loc_server_register() returns a pointer to a loc_srv_t object,
that is then passed to loc_service_register() and
loc_service_add_to_cat().

Added loc_server_unregister() that unregisters the server
and frees the loc_srv_t object.

Updated all callers. The implementation, however, is a stub.
It is not actually possible to call loc_server_register() more
than once, yet.

File:

• uspace/lib/c/generic/loc.c (modified) (6 diffs)

uspace/lib/c/generic/loc.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2007 Josef Cejka
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -239 +239 @@
 }
 
-/** Register new server with loc. */
-errno_t loc_server_register(const char *name)
-{
-        async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER);
+/** Register new server with loc.
+ *
+ * XXX Proper impementation - currently cannot actually call
+ * this function more than once.
+ *
+ * @param name Server name
+ * @param rsrv Place to store new server object on success
+ * @return EOK on succes or an error code
+ */
+errno_t loc_server_register(const char *name, loc_srv_t **rsrv)
+{
+        async_exch_t *exch;
+        loc_srv_t *srv;
+
+        srv = calloc(1, sizeof(loc_srv_t));
+        if (srv == NULL)
+                return ENOMEM;
+
+        exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER);
 
         ipc_call_t answer;
@@ -251 +266 @@
                 async_forget(req);
                 loc_exchange_end(exch);
+                free(srv);
                 return retval;
         }
@@ -264 +280 @@
         loc_exchange_end(exch);
 
+        if (retval != EOK) {
+                free(srv);
+                return retval;
+        }
+
+        *rsrv = srv;
         return retval;
 }
 
+/** Unregister server from loc.
+ *
+ * Unregister server and free server object.
+ *
+ * XXX Proper implementation
+ *
+ * @param srv Server object
+ */
+void loc_server_unregister(loc_srv_t *srv)
+{
+        free(srv);
+}
+
 /** Register new service.
  *
- * @param      fqsn  Fully qualified service name
- * @param[out] sid   Service ID of new service
- *
- */
-errno_t loc_service_register(const char *fqsn, service_id_t *sid)
+ * @param srv Server object
+ * @param fqsn Fully qualified service name
+ * @param sid  Service ID of new service
+ *
+ */
+errno_t loc_service_register(loc_srv_t *srv, const char *fqsn,
+    service_id_t *sid)
 {
         async_exch_t *exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER);
+
+        (void)srv;
 
         ipc_call_t answer;
@@ -310 +349 @@
 /** Unregister service.
  *
- * @param sid   Service ID
- */
-errno_t loc_service_unregister(service_id_t sid)
+ * @param srv Server object
+ * @param sid Service ID
+ */
+errno_t loc_service_unregister(loc_srv_t *srv, service_id_t sid)
 {
         async_exch_t *exch;
         errno_t retval;
+
+        (void)srv;
 
         exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER);
@@ -611 +653 @@
 /** Add service to category.
  *
- * @param svc_id        Service ID
- * @param cat_id        Category ID
- * @return              EOK on success or an error code
- */
-errno_t loc_service_add_to_cat(service_id_t svc_id, service_id_t cat_id)
+ * @param srv    Server object
+ * @param svc_id Service ID
+ * @param cat_id Category ID
+ *
+ * @return EOK on success or an error code
+ */
+errno_t loc_service_add_to_cat(loc_srv_t *srv, service_id_t svc_id,
+    service_id_t cat_id)
 {
         async_exch_t *exch;