Changeset 89749 in vbox

Timestamp:

Jun 16, 2021 5:00:54 PM (3 years ago)

Author:

vboxsync

Message:

Additions: X11: VBoxClient: VMSVGA: process graceful shutdown, bugref:10028.

• Prevent X11 listener thread from infinite waiting for XEvent and let it detect that shutdown request was issued.

• Prevent host listener thread from infinite waiting for host event and let it detect that shutdown request was issued.

• Fix crash on X11 de-initialisation code path, reorder resources release calls.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (9 diffs)

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

@@ -67 +67 @@
 #define MILLIS_PER_INCH (25.4)
 #define DEFAULT_DPI (96.0)
+
+/* Time in milliseconds to relax if no X11 events available. */
+#define VBOX_SVGA_X11_RELAX_TIME_MS  (500)
+/* Time in milliseconds to wait for host events. */
+#define VBOX_SVGA_HOST_EVENT_RX_TIMEOUT_MS  (500)
 
 /** Maximum number of supported screens.  DRM and X11 both limit this to 32. */
@@ -579 +584 @@
 {
     XEvent event;
-    XNextEvent(x11Context.pDisplayRandRMonitoring, &event);
-    int eventTypeOffset = event.type - x11Context.hRandREventBase;
-    switch (eventTypeOffset)
-    {
-        case RRScreenChangeNotify:
-            VBClLogInfo("RRScreenChangeNotify event received\n");
-            queryMonitorPositions();
-            break;
-        default:
-            break;
+
+    if (XPending(x11Context.pDisplayRandRMonitoring) > 0)
+    {
+        XNextEvent(x11Context.pDisplayRandRMonitoring, &event);
+        int eventTypeOffset = event.type - x11Context.hRandREventBase;
+        VBClLogInfo("received X11 event (%d)\n", event.type);
+        switch (eventTypeOffset)
+        {
+            case RRScreenChangeNotify:
+                VBClLogInfo("RRScreenChangeNotify event received\n");
+                queryMonitorPositions();
+                break;
+            default:
+                break;
+        }
+    } else
+    {
+        RTThreadSleep(VBOX_SVGA_X11_RELAX_TIME_MS);
     }
 }
@@ -602 +615 @@
         monitorRandREvents();
     }
+
+    VBClLogInfo("X11 thread gracefully terminated\n");
+
     return 0;
 }
@@ -623 +639 @@
 static int stopX11MonitorThread(void)
 {
-    int rc;
+    int rc = VINF_SUCCESS;
     if (mX11MonitorThread != NIL_RTTHREAD)
     {
@@ -748 +764 @@
 static DECLCALLBACK(void) vbclSVGAStop(void)
 {
+    int rc;
+
+    rc = stopX11MonitorThread(); /** @todo r=andy We ignore rc!? */
+    if (RT_FAILURE(rc))
+    {
+        VBClLogFatalError("cannot stop X11 monitor thread (%Rrc)\n", rc);
+        return;
+    }
+
     if (mpMonitorPositions)
     {
@@ -754 +779 @@
     }
 
-    stopX11MonitorThread(); /** @todo r=andy We ignore rc!? */
+#ifdef WITH_DISTRO_XRAND_XINERAMA
+    XRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
+#else
+    if (x11Context.pXRRSelectInput)
+        x11Context.pXRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
+#endif
+
+    XCloseDisplay(x11Context.pDisplay);
+    XCloseDisplay(x11Context.pDisplayRandRMonitoring);
 
     if (x11Context.pRandLibraryHandle)
@@ -761 +794 @@
         x11Context.pRandLibraryHandle = NULL;
     }
-#ifdef WITH_DISTRO_XRAND_XINERAMA
-    XRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
-    XRRFreeScreenResources(x11Context.pScreenResources);
-#else
-    if (x11Context.pXRRSelectInput)
-        x11Context.pXRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
-    if (x11Context.pXRRFreeScreenResources)
-        x11Context.pXRRFreeScreenResources(x11Context.pScreenResources);
-#endif
-    XCloseDisplay(x11Context.pDisplay);
-    XCloseDisplay(x11Context.pDisplayRandRMonitoring);
 }
 
@@ -1321 +1343 @@
 static DECLCALLBACK(int) vbclSVGAWorker(bool volatile *pfShutdown)
 {
-    RT_NOREF(pfShutdown);
-
     /* Do not acknowledge the first event we query for to pick up old events,
      * e.g. from before a guest reboot. */
@@ -1409 +1429 @@
         do
         {
-            rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, RT_INDEFINITE_WAIT, &events);
-        } while (rc == VERR_INTERRUPTED);
-        if (RT_FAILURE(rc))
+            rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, VBOX_SVGA_HOST_EVENT_RX_TIMEOUT_MS, &events);
+        } while (rc == VERR_TIMEOUT && !ASMAtomicReadBool(pfShutdown));
+
+        if (ASMAtomicReadBool(pfShutdown))
+        {
+            /* Shutdown requested. */
+            break;
+        }
+        else if (RT_FAILURE(rc))
+        {
             VBClLogFatalError("Failure waiting for event, rc=%Rrc\n", rc);
-    }
+        }
+
+    };
+
+    return VINF_SUCCESS;
 }