Changeset 4c6fd56 in mainline for uspace/srv/volsrv

Timestamp:

2023-09-16T19:58:18Z (3 years 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/srv/volsrv/volsrv.c (modified) (5 diffs)

uspace/srv/volsrv/volsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -62 +62 @@
         vol_volumes_t *volumes = NULL;
         vol_parts_t *parts = NULL;
+        loc_srv_t *srv = NULL;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
@@ -79 +80 @@
         async_set_fallback_port_handler(vol_client_conn, parts);
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
@@ -86 +87 @@
 
         service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_VOLSRV, &sid);
+        rc = loc_service_register(srv, SERVICE_NAME_VOLSRV, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
@@ -95 +96 @@
         return EOK;
 error:
+        if (srv != NULL)
+                loc_server_unregister(srv);
         vol_volumes_destroy(volumes);
         vol_parts_destroy(parts);