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

Timestamp:

Apr 16, 2008 10:35:46 AM (17 years ago)

Author:

vboxsync

Message:

HostServices/SharedClipboard: wait forever for the clipboard thread to exit, but assert in debug builds if it takes more than five seconds

File:

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

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

@@ -787 +787 @@
     LogRel(("vboxClipboardDestroy: shutting down host clipboard\n"));
     int rc, rcThread;
+#ifdef RT_STRICT
+    unsigned count = 0;
+#endif
     XEvent ev;
 
@@ -797 +800 @@
     XSendEvent(XtDisplay(g_ctx.widget), XtWindow(g_ctx.widget), false, 0, &ev);
     XFlush(XtDisplay(g_ctx.widget));
-    rc = RTThreadWait(g_ctx.thread, 2000, &rcThread);
+    do
+    {
+        rc = RTThreadWait(g_ctx.thread, 1000, &rcThread);
+        Assert(RT_SUCCESS(rc) || (++count != 5));
+    } while (RT_FAILURE(rc));    
     AssertRC(rc);
     AssertRC(rcThread);