Changeset 7bf29e5 in mainline for uspace/lib/display/src/display.c

Timestamp:

2025-01-09T11:29:38Z (7 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a5c2960e

Parents:

bc3d695 (diff), 4e1221c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• uspace/lib/display/src/display.c (modified) (4 diffs)

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);
 }