Changeset 67796 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Jul 5, 2017 1:37:55 PM (7 years ago)

Author:

vboxsync

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Remove old VbglR3InterruptEventWaits() leftover from seamless.cpp.

Since the VbglR3InterruptEventWaits() API in VBoxGuest is rather clumsy, we
decided to forbid use of VbglR3WaitEvent() in a VBoxGuest session after
VbglR3InterruptEventWaits() has been called. This change removes the last
use of it (there were only two in the whole tree) which conflicts with that:
a sanity test in seamless.cpp which is testing something no longer relevant
in the current code.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless.cpp (modified) (2 diffs)
• testcase/tstSeamlessX11.cpp (modified) (1 diff)

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

@@ -253 +253 @@
 }
 
-/** @todo Expand this? */
-int SeamlessMain::selfTest()
-{
-    int rc = VERR_INTERNAL_ERROR;
-    const char *pcszStage;
-
-    LogRelFlowFunc(("\n"));
-    do {
-        pcszStage = "Testing event loop cancellation";
-        VbglR3InterruptEventWaits();
-        if (RT_FAILURE(VbglR3WaitEvent(VMMDEV_EVENT_VALID_EVENT_MASK, 0, NULL)))
-            break;
-        if (   VbglR3WaitEvent(VMMDEV_EVENT_VALID_EVENT_MASK, 0, NULL)
-            != VERR_TIMEOUT)
-            break;
-        rc = VINF_SUCCESS;
-    } while(0);
-    if (RT_FAILURE(rc))
-        LogRel(("VBoxClient (seamless): self test failed.  Stage: \"%s\"\n",
-                pcszStage));
-    return rc;
-}
-
 /** Service magic number, start of a UUID. */
 #define SEAMLESSSERVICE_MAGIC 0xd28ba727
@@ -322 +299 @@
     if (RT_FAILURE(rc))
         return rc;
-    rc = pSelf->mSeamless.selfTest();
-    if (RT_FAILURE(rc))
-    {
-        pSelf->mSeamless.stop();
-        return rc;
-    }
     pSelf->mIsInitialised = true;
     return VINF_SUCCESS;

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp

@@ -80 +80 @@
 }
 
-int VbglR3WaitEvent(uint32_t , uint32_t cMillies, uint32_t *)
-{
-    return RTSemEventWait(eventSem, cMillies);
-}
-
-int VbglR3InterruptEventWaits(void)
-{
-    return RTSemEventSignal(eventSem);
-}
-
 VBGLR3DECL(int)     VbglR3InitUser(void) { return VINF_SUCCESS; }
 VBGLR3DECL(void)    VbglR3Term(void) {}