Changeset 4e7b0ad in mainline

Timestamp:

2022-12-20T17:47:39Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d9d6f29

Parents:

06176e1

Message:

Add missing actions in display destructor

We might to actually destroy the other components rather than assert
they have been destroyed. But we shall see when we actually implement
graceful shutdown for this (and any other) server.

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (1 diff)
• test/cursor.c (modified) (3 diffs)

uspace/srv/hid/display/display.c

@@ -116 +116 @@
 void ds_display_destroy(ds_display_t *disp)
 {
+        int i;
+
         assert(list_empty(&disp->clients));
         assert(list_empty(&disp->wmclients));
         assert(list_empty(&disp->seats));
-        /* XXX destroy cursors */
+        assert(list_empty(&disp->ddevs));
+        assert(list_empty(&disp->seats));
+        assert(list_empty(&disp->windows));
+
+        /* Destroy cursors */
+        for (i = 0; i < dcurs_limit; i++) {
+                ds_cursor_destroy(disp->cursor[i]);
+                disp->cursor[i] = NULL;
+        }
+
         gfx_color_delete(disp->bg_color);
         free(disp);

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -117 +117 @@
         PCUT_ASSERT_TRUE(resp.render_called);
 
+        ds_ddev_close(ddev);
         ds_cursor_destroy(cursor);
         ds_display_destroy(disp);
@@ -167 +168 @@
         PCUT_ASSERT_FALSE(resp.render_called);
 
+        ds_ddev_close(ddev);
         ds_cursor_destroy(cursor);
         ds_display_destroy(disp);