Changeset 13584 in vbox for trunk/src/VBox/HostServices

Timestamp:

Oct 27, 2008 3:45:12 PM (16 years ago)

Author:

vboxsync

Message:

HostServices/x11: Increased timeout to 2 minutes for trusted Xorg.

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedClipboard/x11.cpp

@@ -51 +51 @@
 #include <X11/Xproto.h>
 #include <X11/StringDefs.h>
+
+#ifdef RT_OS_SOLARIS
+#include <tsol/label.h>
+#endif
 
 /** Do we want to test Utf16 by disabling other text formats? */
@@ -1423 +1427 @@
         /* When the data arrives, the vboxClipboardGetProc callback will be called.  The
            callback will signal the event semaphore when it has processed the data for us. */
+
+#ifdef RT_OS_SOLARIS
+        /*
+         * Trusted Xorg requires a bigger timeout.
+         */
+        unsigned long cTimeoutMillies = CLIPBOARDTIMEOUT;
+        if (is_system_labeled())
+            cTimeoutMillies = 1000 * 120;
+
+        if (RTSemEventWait(g_ctx.waitForData, cTimeoutMillies) != VINF_SUCCESS)
+#else
         if (RTSemEventWait(g_ctx.waitForData, CLIPBOARDTIMEOUT) != VINF_SUCCESS)
+#endif
         {
             /* No need to polute the release log for this. */