Changeset 12791 in vbox

Timestamp:

Sep 29, 2008 12:12:27 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37136

Message:

SharedClipboard/x11.cpp: Handle failure of the worker thread better and added a r=bird @todo on the subject of the short timeout. We cannot return failure if the thread is still running because that will lead to a SIGSEGV after dlclose.

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11.cpp (modified) (1 diff)

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

@@ -798 +798 @@
     rc = RTThreadCreate(&g_ctx.thread, vboxClipboardThread, 0, 0, RTTHREADTYPE_IO,
                         RTTHREADFLAGS_WAITABLE, "SHCLIP");
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("vboxClipboardInit: failed to create the clipboard thread.\n"));
-        RTSemEventDestroy(g_ctx.waitForData);
-        RTSemMutexDestroy(g_ctx.asyncMutex);
-        AssertRCReturn(rc, rc);
-    }
-    return RTThreadUserWait(g_ctx.thread, 1000);
+    AssertRC(rc);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Wait for the thread to initialize.
+         *
+         * We must *NOT* return failure on a timeout because then the code will be
+         * unloaded and we'll be SIGSEGV'ing in the thread.
+         */
+        /** @todo r=bird: This isn't very reliable, waiting for just one second and
+         *        not signalling on failure. *grumble* */
+        int rcThread = VERR_WRONG_ORDER;
+        rc = RTThreadUserWait(g_ctx.thread, 1000);
+        if (RT_SUCCESS(rc))
+        {
+            /* paranoia: check that the thread is actually running */
+            rc = RTThreadWait(g_ctx.thread, 0, &rcThread);
+            Assert(rc == VERR_TIMEOUT);
+            if (RT_FAILURE(rc))
+                return VINF_SUCCESS;
+            LogRel(("vboxClipboardInit: thread died unexpectedly, rcThread=%Rrc, rcWait=%Rrc\n", rcThread, rc));
+        }
+        else
+        {
+            LogRel(("vboxClipboardInit: thread failed to start in a timely manner, rc=%Rrc\n", rc));
+            rc = RTThreadWait(g_ctx.thread, 30000, &rcThread);
+            if (RT_FAILURE(rc))
+            {
+                LogRel(("vboxClipboardInit: thread still running! (rcThread=%Rrc, rcWait=%Rrc)\n", rcThread, rc));
+                return VINF_SUCCESS;
+            }
+            LogRel(("vboxClipboardInit: rcThread=%Rrc, rcWait=%Rrc\n", rcThread, rc));
+            rc = RT_FAILURE(rcThread) ? rcThread : VERR_INTERNAL_ERROR;
+        }
+    }
+    else
+        LogRel(("vboxClipboardInit: failed to create the clipboard thread. rc=%Rrc\n", rc));
+    RTSemEventDestroy(g_ctx.waitForData);
+    RTSemMutexDestroy(g_ctx.asyncMutex);
+    return rc;
 }