Changeset da412547 in mainline

Timestamp:

2019-11-10T17:07:44Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b093a62

Parents:

6427f083

Message:

Display server should deal with client not destroying windows properly

Location:

uspace/srv/hid/display

Files:

• client.c (modified) (1 diff)
• test/client.c (modified) (1 diff)
• window.c (modified) (1 diff)
• window.h (modified) (1 diff)

uspace/srv/hid/display/client.c

@@ -75 +75 @@
 void ds_client_destroy(ds_client_t *client)
 {
+        ds_window_t *window;
+
+        window = ds_client_first_window(client);
+        while (window != NULL) {
+                ds_window_destroy(window);
+                window = ds_client_first_window(client);
+        }
+
         assert(list_empty(&client->windows));
         ds_display_remove_client(client);

uspace/srv/hid/display/test/client.c

@@ -203 +203 @@
 }
 
+/** Test client being destroyed while still having a window.
+ *
+ * This can happen if client forgets to destroy window or if the client
+ * is disconnected (or terminated).
+ */
+PCUT_TEST(client_leftover_window)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_window_t *wnd;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_window_create(client, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 PCUT_EXPORT(client);

uspace/srv/hid/display/window.c

@@ -220 +220 @@
  * @param wnd Window GC
  */
-errno_t ds_window_destroy(ds_window_t *wnd)
-{
-        errno_t rc;
-
+void ds_window_destroy(ds_window_t *wnd)
+{
         ds_client_remove_window(wnd);
-
-        rc = gfx_context_delete(wnd->gc);
-        if (rc != EOK)
-                return rc;
+        (void) gfx_context_delete(wnd->gc);
 
         free(wnd);
-        return EOK;
 }
 

uspace/srv/hid/display/window.h

@@ -47 +47 @@
 
 extern errno_t ds_window_create(ds_client_t *, ds_window_t **);
-extern errno_t ds_window_destroy(ds_window_t *);
+extern void ds_window_destroy(ds_window_t *);
 extern gfx_context_t *ds_window_get_ctx(ds_window_t *);