Changeset 93168 in vbox for trunk/src

Timestamp:

Jan 10, 2022 6:00:59 PM (3 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Use i_setSessionStatus() in GuestSession::i_startSession() to have and use one centralized way of setting a session's status.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -2148 +2148 @@
  *                              was returned. Optional.
  *
- * @note    Takes the write lock.
+ * @note    Takes the read and write locks.
  */
 int GuestSession::i_startSession(int *prcGuest)
 {
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     LogFlowThisFunc(("mID=%RU32, mName=%s, uProtocolVersion=%RU32, openFlags=%x, openTimeoutMS=%RU32\n",
@@ -2162 +2162 @@
     if (mData.mProtocolVersion < 2)
     {
-        mData.mStatus = GuestSessionStatus_Started;
-
+        alock.release(); /* Release lock before changing status. */
+
+        /* ignore rc */ i_setSessionStatus(GuestSessionStatus_Started, VINF_SUCCESS);
         LogFlowThisFunc(("Installed Guest Additions don't support opening dedicated sessions, skipping\n"));
         return VINF_SUCCESS;
@@ -2173 +2174 @@
     /** @todo mData.mSession.uFlags validation. */
 
+    alock.release(); /* Release lock before changing status. */
+
     /* Set current session status. */
-    mData.mStatus = GuestSessionStatus_Starting;
-    mData.mRC     = VINF_SUCCESS; /* Clear previous error, if any. */
-
-    int vrc;
+    int vrc = i_setSessionStatus(GuestSessionStatus_Starting, VINF_SUCCESS);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     GuestWaitEvent *pEvent = NULL;
@@ -2194 +2196 @@
     if (RT_FAILURE(vrc))
         return vrc;
+
+    alock.acquire(); /* Re-acquire lock before accessing session attributes below. */
 
     VBOXHGCMSVCPARM paParms[8];
@@ -2219 +2223 @@
     else
     {
-        alock.acquire(); /* Re-aquire lock before changing status. */
-
         /*
          * Unable to start guest session - update its current state.
@@ -2227 +2229 @@
          * same function again will work though.
          */
-        mData.mStatus = GuestSessionStatus_Error;
-        mData.mRC = vrc;
+        /* ignore rc */ i_setSessionStatus(GuestSessionStatus_Error, vrc);
     }