Changeset 8279aab in mainline

Timestamp:

2025-01-07T12:26:56Z (2 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

4e1221c

Parents:

12dd36c

git-author:

Jiri Svoboda <jiri@…> (2025-01-06 19:26:42)

git-committer:

Jiri Svoboda <jiri@…> (2025-01-07 12:26:56)

Message:

ui_lock() needs to lock display

If ui_lock() is used to lock UI while destroying a window in a separate
fibril, we need to make sure we cannot get display events for
that destroyed window.

Location:

uspace/lib

Files:

• display/include/display.h (modified) (2 diffs)
• display/src/display.c (modified) (4 diffs)
• ui/src/ui.c (modified) (3 diffs)
• ui/src/window.c (modified) (9 diffs)

uspace/lib/display/include/display.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -48 +48 @@
 extern errno_t display_open(const char *, display_t **);
 extern void display_close(display_t *);
+extern void display_lock(display_t *);
+extern void display_unlock(display_t *);
 extern errno_t display_get_info(display_t *, display_info_t *);
 

uspace/lib/display/src/display.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -138 +138 @@
 }
 
+/*
+ * Lock display.
+ *
+ * While display is locked, display event handlers will not be called.
+ *
+ * @param display Display
+ */
+void display_lock(display_t *display)
+{
+        fibril_mutex_lock(&display->lock);
+}
+
+/*
+ * Unlock display.
+ *
+ * @param display Display
+ */
+void display_unlock(display_t *display)
+{
+        fibril_mutex_unlock(&display->lock);
+}
+
 /** Initialize window parameters structure.
  *
@@ -700 +722 @@
         display_wnd_ev_t event;
 
+        display_lock(display);
+
         while (true) {
-                fibril_mutex_lock(&display->lock);
-
                 if (display->sess != NULL)
                         rc = display_get_event(display, &window, &event);
                 else
                         rc = ENOENT;
-
-                fibril_mutex_unlock(&display->lock);
 
                 if (rc != EOK)
@@ -752 +772 @@
         }
 
+        display_unlock(display);
         async_answer_0(icall, EOK);
 }

uspace/lib/ui/src/ui.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -568 +568 @@
 void ui_lock(ui_t *ui)
 {
+        if (ui->display != NULL)
+                display_lock(ui->display);
         fibril_mutex_lock(&ui->lock);
 }
@@ -582 +584 @@
 {
         fibril_mutex_unlock(&ui->lock);
+        if (ui->display != NULL)
+                display_unlock(ui->display);
 }
 

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -978 +978 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         ui_window_send_close(window);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -989 +989 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         (void)nfocus;
 
@@ -998 +998 @@
 
         ui_window_send_focus(window, nfocus);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1007 +1007 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         ui_window_send_kbd(window, kbd_event);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1023 +1023 @@
                 return;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
 
         claim = ui_wdecor_pos_event(window->wdecor, event);
         if (claim == ui_claimed) {
-                ui_unlock(ui);
+                fibril_mutex_unlock(&ui->lock);
                 return;
         }
 
         ui_window_send_pos(window, event);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1048 +1048 @@
                 return;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         (void) ui_window_resize(window, rect);
         ui_window_send_resize(window);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1060 +1060 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
 
         if (window->wdecor != NULL && nfocus == 0) {
@@ -1068 +1068 @@
 
         ui_window_send_unfocus(window, nfocus);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }