Changeset 4c6fd56 in mainline for uspace/srv/test/chardev-test/main.c

Timestamp:

2023-09-16T19:58:18Z (9 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/srv/test/chardev-test/main.c (modified) (4 diffs)

uspace/srv/test/chardev-test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -118 +118 @@
 {
         errno_t rc;
+        loc_srv_t *srv;
 
         printf("%s: Character device test service\n", NAME);
         async_set_fallback_port_handler(chardev_test_connection, NULL);
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Failed registering server.: %s\n", NAME, str_error(rc));
@@ -140 +141 @@
         partialx_srvs.sarg = NULL;
 
-        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_SMALLX, &smallx_svc_id);
+        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_SMALLX,
+            &smallx_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
-        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_LARGEX, &largex_svc_id);
+                goto error;
+        }
+
+        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_LARGEX,
+            &largex_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                return rc;
-        }
-
-        rc = loc_service_register(SERVICE_NAME_CHARDEV_TEST_PARTIALX, &partialx_svc_id);
+                goto error;
+        }
+
+        rc = loc_service_register(srv, SERVICE_NAME_CHARDEV_TEST_PARTIALX,
+            &partialx_svc_id);
         if (rc != EOK) {
                 printf("%s: Failed registering service.: %s\n", NAME, str_error(rc));
-                return rc;
+                goto error;
         }
 
@@ -164 +168 @@
         /* Not reached */
         return 0;
+error:
+        if (smallx_svc_id != 0)
+                loc_service_unregister(srv, smallx_svc_id);
+        if (largex_svc_id != 0)
+                loc_service_unregister(srv, largex_svc_id);
+        if (partialx_svc_id != 0)
+                loc_service_unregister(srv, partialx_svc_id);
+        loc_server_unregister(srv);
+        return rc;
 }