Changeset 83137 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 21, 2020 9:18:29 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136254

Message:

bugref:9637. Build fix.

File:

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

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

@@ -42 +42 @@
 #include <VBox/VBoxGuestLib.h>
 
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
@@ -62 +63 @@
 /** Thread to listen to some of the X server events. */
 RTTHREAD mX11MonitorThread = NIL_RTTHREAD;
+/** Shutdown indicator for the monitor thread. */
+static bool g_fMonitorThreadShutdown = false;
 
 struct X11VMWRECT /* xXineramaScreenInfo in Xlib headers. */
@@ -201 +204 @@
             break;
         default:
-            VBClLogInfo("Unknown RR event\n");
+            VBClLogInfo("Unknown RR event: %d\n", event.type);
             break;
     }
 }
 
-int x11MonitorThreadFunction(RTTHREAD hThreadSelf, void *pvUser)
-{
-    (void)hThreadSelf;
-    (void*)pvUser;
-    while(1)
+/**
+ * @callback_method_impl{FNRTTHREAD}
+ */
+static DECLCALLBACK(int) x11MonitorThreadFunction(RTTHREAD hThreadSelf, void *pvUser)
+{
+    RT_NOREF(hThreadSelf, pvUser);
+    while (!ASMAtomicReadBool(&g_fMonitorThreadShutdown))
     {
         monitorRandREvents();
@@ -221 +226 @@
     int rc;
 
+    Assert(g_fMonitorThreadShutdown == false);
     if (mX11MonitorThread == NIL_RTTHREAD)
     {
-        rc = RTThreadCreate(&mX11MonitorThread, x11MonitorThreadFunction, 0, 0,
-                            RTTHREADTYPE_MSG_PUMP, RTTHREADFLAGS_WAITABLE,
-                            "X11 events");
+        rc = RTThreadCreate(&mX11MonitorThread, x11MonitorThreadFunction, NULL /*pvUser*/, 0 /*cbStack*/,
+                            RTTHREADTYPE_MSG_PUMP, RTTHREADFLAGS_WAITABLE, "X11 events");
         if (RT_FAILURE(rc))
             VBClLogFatalError("Warning: failed to start X11 monitor thread (VBoxClient) rc=%Rrc!\n", rc);
     }
+    else
+        rc = VINF_ALREADY_INITIALIZED;
     return rc;
 }
@@ -237 +244 @@
     if (mX11MonitorThread != NIL_RTTHREAD)
     {
+        ASMAtomicWriteBool(&g_fMonitorThreadShutdown, true);
+        /** @todo  Send event to thread to get it out of XNextEvent. */
         //????????
         //mX11Monitor.interruptEventWait();
-        rc = RTThreadWait(mX11MonitorThread, 1000, NULL);
+        rc = RTThreadWait(mX11MonitorThread, RT_MS_1SEC, NULL /*prc*/);
         if (RT_SUCCESS(rc))
+        {
             mX11MonitorThread = NIL_RTTHREAD;
+            g_fMonitorThreadShutdown = false;
+        }
         else
             VBClLogError("Failed to stop X11 monitor thread, rc=%Rrc!\n", rc);
@@ -279 +291 @@
     if (x11Context.pDisplay == NULL)
         return;
-    if(!XQueryExtension(x11Context.pDisplay, "VMWARE_CTRL",
-                        &x11Context.hVMWMajor, &dummy, &dummy))
+    if (!XQueryExtension(x11Context.pDisplay, "VMWARE_CTRL",
+                         &x11Context.hVMWMajor, &dummy, &dummy))
     {
         XCloseDisplay(x11Context.pDisplay);
@@ -297 +309 @@
     x11Context.hEventMask = RRScreenChangeNotifyMask;
     if (x11Context.hRandRMinor >= 2)
-        x11Context.hEventMask |=  RRCrtcChangeNotifyMask |
-            RROutputChangeNotifyMask |
-            RROutputPropertyNotifyMask;
+        x11Context.hEventMask |= RRCrtcChangeNotifyMask
+                               | RROutputChangeNotifyMask
+                               | RROutputPropertyNotifyMask;
     x11Context.rootWindow = DefaultRootWindow(x11Context.pDisplay);
     x11Context.hOutputCount = determineOutputCount();
@@ -343 +355 @@
     bool fInitialSpace = true;
 
-    while(*p)
+    while (*p)
     {
         if (*p != ' ')
@@ -353 +365 @@
             if (iNameIndex >= 4)
             {
-                if (outPszModeName[iNameIndex-1] == 'x' &&
-                    outPszModeName[iNameIndex-2] == 'o' &&
-                    outPszModeName[iNameIndex-3] == 'b')
+                if (   outPszModeName[iNameIndex-1] == 'x'
+                    && outPszModeName[iNameIndex-2] == 'o'
+                    && outPszModeName[iNameIndex-3] == 'b')
                     break;
             }
@@ -539 +551 @@
 static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
 {
-    (void)ppInterface;
-    (void)fDaemonised;
+    RT_NOREF(ppInterface, fDaemonised);
     int rc;
     uint32_t events;
@@ -562 +573 @@
     int eventMask = RRScreenChangeNotifyMask;
     if (x11Context.hRandRMinor >= 2)
-        eventMask |=  RRCrtcChangeNotifyMask |
-            RROutputChangeNotifyMask |
-            RROutputPropertyNotifyMask;
+        eventMask |= RRCrtcChangeNotifyMask
+                   | RROutputChangeNotifyMask
+                   | RROutputPropertyNotifyMask;
     if (x11Context.hRandRMinor >= 4)
-        eventMask |= RRProviderChangeNotifyMask |
-            RRProviderPropertyNotifyMask |
-            RRResourceChangeNotifyMask;
+        eventMask |= RRProviderChangeNotifyMask
+                   | RRProviderPropertyNotifyMask
+                   | RRResourceChangeNotifyMask;
     for (;;)
     {
@@ -591 +602 @@
                 if (!(aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_DISABLED))
                 {
-                    if ((idDisplay == 0) || (aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_ORIGIN))
+                    if (idDisplay == 0 || (aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_ORIGIN))
                     {
                         aMonitors[idDisplay].xOrigin = aDisplays[i].xOrigin;