Changeset 98594 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

Timestamp:

Feb 15, 2023 4:48:37 PM (2 years ago)

Author:

vboxsync

Message:

Additions: X11: Make legacy display resize service to gracefully shutdown, bugref:10359.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -32 +32 @@
 #include <iprt/mem.h>
 #include <iprt/string.h>
+#include <iprt/asm.h>
 
 #include <X11/Xlib.h>
@@ -146 +147 @@
 /** Main loop: handle display hot-plug events, property updates (which can
  *  signal VT switches hot-plug in old X servers). */
-static void runDisplay(struct DISPLAYSTATE *pState)
+static void runDisplay(struct DISPLAYSTATE *pState, bool volatile *pfShutdown)
 {
     Display *pDisplay = pState->pDisplay;
@@ -166 +167 @@
      * against spontaneous termination, especially as it will never get
      * properly tested, so I will go for the second. */
-    while (true)
+    while (!ASMAtomicReadBool(pfShutdown))
     {
         XEvent event;
@@ -281 +282 @@
 static DECLCALLBACK(int) run(bool volatile *pfShutdown)
 {
-    RT_NOREF(pfShutdown); /** @todo Probably very wrong not to check pfShutdown... Especially given no pfnStop implementation. */
     struct DISPLAYSTATE *pSelf = &g_DisplayState;
 
     if (!pSelf->mfInit)
         return VERR_WRONG_ORDER;
-    runDisplay(pSelf);
-    return VERR_INTERNAL_ERROR;  /* "Should never reach here." */
+
+    runDisplay(pSelf, pfShutdown);
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) stop(void)
+{
+    /* Nothing to do here. Implement empty callback, so
+     * main thread can set pfShutdown=true on process termination. */
 }
 
@@ -300 +311 @@
     init,                               /* pfnInit */
     run,                                /* pfnWorker */
-    NULL,                               /* pfnStop */
+    stop,                               /* pfnStop */
     NULL,                               /* pfnTerm */
 };