Changeset 83554 in vbox for trunk/src

Timestamp:

Apr 4, 2020 1:29:02 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Make sure to set a session's thread stopped state before notifying the host. bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1623 +1623 @@
     }
 
-    VGSvcVerbose(3, "Guest session ID=%RU32 thread ended with sessionStatus=%RU32, sessionRc=%Rrc\n",
-                 idSession, uSessionStatus, uSessionRc);
-
-    /*
-     * Report final status.
-     */
+    /* Make sure to set stopped state before we let the host know. */
+    ASMAtomicWriteBool(&pThread->fStopped, true);
+
+    /* Report final status, regardless if we failed to wait above, so that the host knows what's going on. */
+    VGSvcVerbose(3, "Reporting final status %RU32 of session ID=%RU32\n", uSessionStatus, idSession);
     Assert(uSessionStatus != GUEST_SESSION_NOTIFYTYPE_UNDEFINED);
-    VBGLR3GUESTCTRLCMDCTX ctx = { idClient, VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(idSession),
-                                  0 /* uProtocol, unused */, 0 /* uNumParms, unused */ };
+
+    VBGLR3GUESTCTRLCMDCTX ctx = { g_idControlSvcClient, VBOX_GUESTCTRL_CONTEXTID_MAKE_SESSION(idSession)};
     rc2 = VbglR3GuestCtrlSessionNotify(&ctx, uSessionStatus, uSessionRc);
     if (RT_FAILURE(rc2))
-        VGSvcError("Reporting session ID=%RU32 final status failed with rc=%Rrc\n", idSession, rc2);
-
-    VGSvcVerbose(3, "Session ID=%RU32 thread ending\n", idSession);
+        VGSvcError("Reporting final status of session ID=%RU32 failed with rc=%Rrc\n", idSession, rc2);
+
+    VGSvcVerbose(3, "Thread for session ID=%RU32 ended with sessionStatus=%RU32, sessionRc=%Rrc\n",
+                 idSession, uSessionStatus, uSessionRc);
+
     return VINF_SUCCESS;
 }
@@ -2390 +2391 @@
     RTListForEach(pList, pSessionCur, VBOXSERVICECTRLSESSIONTHREAD, Node)
     {
-        AssertMsgReturn(pSessionCur->StartupInfo.uSessionID != pSessionStartupInfo->uSessionID,
-                        ("Guest session thread ID=%RU32 (%p) already exists when it should not\n",
-                         pSessionCur->StartupInfo.uSessionID, pSessionCur), VERR_ALREADY_EXISTS);
+        AssertMsgReturn(   pSessionCur->fStopped == true
+                        || pSessionCur->StartupInfo.uSessionID != pSessionStartupInfo->uSessionID,
+                        ("Guest session thread ID=%RU32 already exists (fStopped=%RTbool)\n",
+                         pSessionCur->StartupInfo.uSessionID, pSessionCur->fStopped), VERR_ALREADY_EXISTS);
     }
 #endif
@@ -2545 +2547 @@
         rc = RTThreadWait(pThread->Thread, uTimeoutMS, &rcThread);
         if (RT_SUCCESS(rc))
+        {
+            AssertMsg(pThread->fStopped, ("Thread of session ID=%RU32 not in stopped state when it should\n",
+                      pThread->StartupInfo.uSessionID));
+
             VGSvcVerbose(3, "Session thread ID=%RU32 ended with rc=%Rrc\n", pThread->StartupInfo.uSessionID, rcThread);
+        }
         else
             VGSvcError("Waiting for session thread ID=%RU32 to close failed with rc=%Rrc\n", pThread->StartupInfo.uSessionID, rc);
     }
-
+    else
+        VGSvcVerbose(3, "Thread for session ID=%RU32 not in started state, skipping wait\n", pThread->StartupInfo.uSessionID);
+
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -2565 +2575 @@
     AssertPtrReturn(pThread, VERR_INVALID_POINTER);
 
+    const uint32_t uSessionID = pThread->StartupInfo.uSessionID;
+
+    VGSvcVerbose(3, "Destroying session ID=%RU32 ...\n", uSessionID);
+
     int rc = VGSvcGstCtrlSessionThreadWait(pThread, 5 * 60 * 1000 /* 5 minutes timeout */, fFlags);
-
-    /* Remove session from list and destroy object. */
-    RTListNodeRemove(&pThread->Node);
-
-    RTMemFree(pThread);
-    pThread = NULL;
-
+    if (RT_SUCCESS(rc))
+    {
+        /* Remove session from list and destroy object. */
+        RTListNodeRemove(&pThread->Node);
+
+        RTMemFree(pThread);
+        pThread = NULL;
+    }
+
+    VGSvcVerbose(3, "Destroyed session ID=%RU32 with %Rrc\n", uSessionID, rc);
     return rc;
 }