Changeset 52309 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 7, 2014 7:17:50 AM (10 years ago)

Author:

vboxsync

Message:

DisplayImpl: do not wait for InvalidateAndUpdateEMT completion, because it blocks the GUI if the request takes a long time to complete.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -414 +414 @@
 
 private:
-    static void i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll);
-    static int  i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
+    static int i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll);
+    static int i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
 
     int  i_videoAccelRefreshProcess(void);

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -3160 +3160 @@
 }
 
-void Display::i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll)
-{
+int Display::i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll)
+{
+    LogRelFlowFunc(("uId=%d, fUpdateAll %d\n", uId, fUpdateAll));
+
     unsigned uScreenId;
     for (uScreenId = (fUpdateAll ? 0 : uId); uScreenId < pDisplay->mcMonitors; uScreenId++)
@@ -3244 +3246 @@
             break;
     }
+    LogRelFlowFunc(("done\n"));
+    return VINF_SUCCESS;
 }
 
@@ -3272 +3276 @@
     alock.release();
 
-    /* pdm.h says that this has to be called from the EMT thread */
-    int rcVBox = VMR3ReqCallVoidWaitU(ptrVM.rawUVM(), VMCPUID_ANY, (PFNRT)Display::i_InvalidateAndUpdateEMT,
-                                      3, this, 0, true);
+    int rcVBox = VMR3ReqCallNoWaitU(ptrVM.rawUVM(), VMCPUID_ANY, (PFNRT)Display::i_InvalidateAndUpdateEMT,
+                                    3, this, 0, true);
     alock.acquire();
 
@@ -3295 +3298 @@
         return ptrVM.rc();
 
-    /* pdm.h says that this has to be called from the EMT thread */
-    int rcVBox = VMR3ReqCallVoidWaitU(ptrVM.rawUVM(), VMCPUID_ANY, (PFNRT)Display::i_InvalidateAndUpdateEMT,
-                                      3, this, aScreenId, false);
+    int rcVBox = VMR3ReqCallNoWaitU(ptrVM.rawUVM(), VMCPUID_ANY, (PFNRT)Display::i_InvalidateAndUpdateEMT,
+                                    3, this, aScreenId, false);
     if (RT_FAILURE(rcVBox))
         rc = setError(VBOX_E_IPRT_ERROR,