Changeset 90055 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Jul 6, 2021 10:58:38 AM (3 years ago)

Author:

vboxsync

Message:

Additions: X11: seamless: prevent hang on shutdown, bugref:10032.

This commit adds return code check when notifying X11 monitor thread
to shutdown. At some circumstances (when X11 is no longer running) this
operation might fail and service will hang or crash on shutdown.
In such situation, simply skip problematic de-init path and proceed to
service termination.

Also in this commit, do not try to wait for X11 monitor thread termination
second time, in pfnTerm(), since it was already done/attempted in pfnStop().

File:

• trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp (modified) (2 diffs)

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

@@ -158 +158 @@
 int SeamlessMain::term(void)
 {
-    int rc;
-
-    if (mX11MonitorThread)
-    {
-        rc = RTThreadWait(mX11MonitorThread, RT_MS_30SEC, NULL);
-        if (RT_SUCCESS(rc))
-        {
-            mX11MonitorThread = NIL_RTTHREAD;
-        }
-        else
-            VBClLogError("Failed to stop X11 monitor thread, rc=%Rrc\n", rc);
-    }
-    else
-        rc = VINF_SUCCESS;
-
     mX11Monitor.uninit();
-
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -298 +282 @@
 
     mX11MonitorThreadStopping = true;
-    mX11Monitor.interruptEventWait();
+    if (!mX11Monitor.interruptEventWait())
+    {
+        VBClLogError("Unable to notify X11 monitor thread\n");
+        return VERR_INVALID_STATE;
+    }
 
     int rcThread;