Changeset 4c6fd56 in mainline for uspace/app

Timestamp:

2023-09-16T19:58:18Z (2 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.

Location:

uspace/app

Files:

• display-cfg/test/seats.c (modified) (2 diffs)
• taskbar/test/wndlist.c (modified) (3 diffs)
• terminal/terminal.c (modified) (3 diffs)
• terminal/terminal.h (modified) (2 diffs)

uspace/app/display-cfg/test/seats.c

@@ -94 +94 @@
         service_id_t sid;
         test_response_t resp;
+        loc_srv_t *srv;
 
         async_set_fallback_port_handler(test_dispcfg_conn, &resp);
 
         // FIXME This causes this test to be non-reentrant!
-        rc = loc_server_register(test_dispcfg_server);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = loc_service_register(test_dispcfg_svc, &sid);
+        rc = loc_server_register(test_dispcfg_server, &srv);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(srv, test_dispcfg_svc, &sid);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -135 +136 @@
         dcfg_seats_destroy(seats);
         display_cfg_destroy(dcfg);
+
+        rc = loc_service_unregister(srv, sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        loc_server_unregister(srv);
 }
 

uspace/app/taskbar/test/wndlist.c

@@ -139 +139 @@
         ui_fixed_t *fixed = NULL;
         wndlist_t *wndlist;
+        loc_srv_t *srv;
 
         /* Set up a test WM service */
@@ -145 +146 @@
 
         // FIXME This causes this test to be non-reentrant!
-        rc = loc_server_register(test_wndmgt_server);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = loc_service_register(test_wndmgt_svc, &sid);
+        rc = loc_server_register(test_wndmgt_server, &srv);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(srv, test_wndmgt_svc, &sid);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -177 +178 @@
         ui_destroy(ui);
 
-        rc = loc_service_unregister(sid);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        rc = loc_service_unregister(srv, sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        loc_server_unregister(srv);
 }
 

uspace/app/terminal/terminal.c

@@ -1022 +1022 @@
         term->srvs.sarg = term;
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &term->srv);
         if (rc != EOK) {
                 printf("Error registering server.\n");
@@ -1033 +1033 @@
             task_get_id());
 
-        rc = loc_service_register(vc, &term->dsid);
+        rc = loc_service_register(term->srv, vc, &term->dsid);
         if (rc != EOK) {
                 printf("Error registering service.\n");
@@ -1063 +1063 @@
         return EOK;
 error:
+        if (term->dsid != 0)
+                loc_service_unregister(term->srv, term->dsid);
+        if (term->srv != NULL)
+                loc_server_unregister(term->srv);
         if (term->window != NULL)
                 ui_window_destroy(term->window);

uspace/app/terminal/terminal.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -91 +91 @@
         charfield_t *ubuf;
 
+        loc_srv_t *srv;
         service_id_t dsid;
         con_srvs_t srvs;