Changeset af967ef9 in mainline

Timestamp:

2023-10-10T17:37:09Z (15 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f9ae472

Parents:

bd2fab5

Message:

GFX Demo should quit more prompty

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (12 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -69 +69 @@
 
 static bool quit = false;
+static FIBRIL_MUTEX_INITIALIZE(quit_lock);
+static FIBRIL_CONDVAR_INITIALIZE(quit_cv);
 static gfx_typeface_t *tface;
 static gfx_font_t *font;
@@ -83 +85 @@
         // XXX Need a proper way to determine text mode
         return w <= 80;
+}
+
+/** Sleep until timeout or quit request.
+ *
+ * @param msec Number of microseconds to sleep for
+ */
+static void demo_msleep(unsigned msec)
+{
+        fibril_mutex_lock(&quit_lock);
+
+        if (!quit) {
+                (void) fibril_condvar_wait_timeout(&quit_cv, &quit_lock,
+                    (usec_t)msec * 1000);
+        }
+
+        fibril_mutex_unlock(&quit_lock);
 }
 
@@ -316 +334 @@
                 gfx_color_delete(color);
 
-                fibril_usleep(500 * 1000);
-
+                demo_msleep(500);
                 if (quit)
                         break;
@@ -478 +495 @@
                         if (rc != EOK)
                                 goto error;
-                        fibril_usleep(250 * 1000);
-
+
+                        demo_msleep(250);
                         if (quit)
                                 goto out;
@@ -539 +556 @@
                 }
 
-                fibril_usleep(500 * 1000);
-
+                demo_msleep(500);
                 if (quit)
                         break;
@@ -600 +616 @@
                 }
 
-                fibril_usleep(500 * 1000);
-
+                demo_msleep(500);
                 if (quit)
                         break;
@@ -791 +806 @@
 
         for (i = 0; i < 10; i++) {
-                fibril_usleep(500 * 1000);
+                demo_msleep(500);
                 if (quit)
                         break;
@@ -872 +887 @@
 
         for (i = 0; i < 10; i++) {
-                fibril_usleep(500 * 1000);
+                demo_msleep(500);
                 if (quit)
                         break;
@@ -969 +984 @@
                 }
 
-                fibril_usleep(500 * 1000);
-
+                demo_msleep(500);
                 if (quit)
                         break;
@@ -1178 +1192 @@
 }
 
+static void demo_quit(void)
+{
+        fibril_mutex_lock(&quit_lock);
+        quit = true;
+        fibril_mutex_unlock(&quit_lock);
+        fibril_condvar_broadcast(&quit_cv);
+}
+
 static void wnd_close_event(void *arg)
 {
-        quit = true;
+        demo_quit();
 }
 
@@ -1186 +1208 @@
 {
         if (event->type == KEY_PRESS)
-                quit = true;
+                demo_quit();
 }
 
 static void uiwnd_close_event(ui_window_t *window, void *arg)
 {
-        quit = true;
+        demo_quit();
 }
 
@@ -1197 +1219 @@
 {
         if (event->type == KEY_PRESS)
-                quit = true;
+                demo_quit();
 }