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

Timestamp:

Jun 15, 2020 12:28:46 PM (5 years ago)

Author:

vboxsync

Message:

bugref:9637. don't make vmware_ctrl extention call at each resize iteration in 32-bit but rather only once during initilization. it causes a hang in xserver.

File:

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

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

@@ -436 +436 @@
                             int screen, xXineramaScreenInfo extents[], int number)
 {
-   xVMwareCtrlSetTopologyReply rep;
-   xVMwareCtrlSetTopologyReq *req;
-
-   long len;
-
-   LockDisplay(dpy);
-
-   GetReq(VMwareCtrlSetTopology, req);
-   req->reqType = hExtensionMajorOpcode;
-   req->VMwareCtrlReqType = X_VMwareCtrlSetTopology;
-   req->screen = screen;
-   req->number = number;
-
-   len = ((long) number) << 1;
-   SetReqLen(req, len, len);
-   len <<= 2;
-   _XSend(dpy, (char *)extents, len);
-
-   if (!_XReply(dpy, (xReply *)&rep,
-                (SIZEOF(xVMwareCtrlSetTopologyReply) - SIZEOF(xReply)) >> 2,
-                xFalse))
-   {
-       UnlockDisplay(dpy);
-       SyncHandle();
-       return false;
-   }
-   UnlockDisplay(dpy);
-   SyncHandle();
-   return true;
+    xVMwareCtrlSetTopologyReply rep;
+    xVMwareCtrlSetTopologyReq *req;
+
+    long len;
+
+    LockDisplay(dpy);
+
+    GetReq(VMwareCtrlSetTopology, req);
+    req->reqType = hExtensionMajorOpcode;
+    req->VMwareCtrlReqType = X_VMwareCtrlSetTopology;
+    req->screen = screen;
+    req->number = number;
+
+    len = ((long) number) << 1;
+    SetReqLen(req, len, len);
+    len <<= 2;
+    _XSend(dpy, (char *)extents, len);
+
+    if (!_XReply(dpy, (xReply *)&rep,
+                 (SIZEOF(xVMwareCtrlSetTopologyReply) - SIZEOF(xReply)) >> 2,
+                 xFalse))
+    {
+        UnlockDisplay(dpy);
+        SyncHandle();
+        return false;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return true;
 }
 
@@ -1153 +1153 @@
 {
     XGrabServer(x11Context.pDisplay);
+    /* In 32-bit guests GAs build on our release machines causes an xserver lock during vmware_ctrl extention
+     * if we do the call withing XGrab. So we disabled this call for 32-bit GAs. */
+#if ARCH_BITS != 32
     if (x11Context.fWmwareCtrlExtention)
         callVMWCTRL(paOutputs);
-
+#endif
 #ifdef WITH_DISTRO_XRAND_XINERAMA
     x11Context.pScreenResources = XRRGetScreenResources(x11Context.pDisplay, x11Context.rootWindow);
@@ -1316 +1319 @@
                     iRunningX += aOutputs[j].width;
             }
+            /* In 32-bit guests GAs build on our release machines causes an xserver lock during vmware_ctrl extention
+               if we do the call withing XGrab. We make the call the said extension only once (to connect the outputs)
+               rather than at each resize iteration. */
+#if ARCH_BITS == 32
+            if (fFirstRun)
+                callVMWCTRL(aOutputs);
+#endif
             setXrandrTopology(aOutputs);
             /* Wait for some seconds and set toplogy again after the boot. In some desktop environments (cinnamon) where