Changeset e49b7997 in mainline

Timestamp:

2020-05-07T17:36:41Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c11ee605

Parents:

ef30659

Message:

Avoid race between closing display and getting events

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (1 diff)
• lib/display/src/display.c (modified) (2 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -499 +499 @@
                 return rc;
 
+        display_window_destroy(window);
+        display_close(display);
+
         return EOK;
 }

uspace/lib/display/src/display.c

@@ -123 +123 @@
 void display_close(display_t *display)
 {
+        fibril_mutex_lock(&display->lock);
         async_hangup(display->sess);
+        display->sess = NULL;
 
         /* Wait for callback handler to terminate */
 
-        fibril_mutex_lock(&display->lock);
         while (!display->cb_done)
                 fibril_condvar_wait(&display->cv, &display->lock);
@@ -495 +496 @@
 
         while (true) {
-                rc = display_get_event(display, &window, &event);
+                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)
                         break;