Changeset 77585 in vbox for trunk/src

Timestamp:

Mar 6, 2019 4:27:47 PM (6 years ago)

Author:

vboxsync

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

129205

Message:

Guest Control/Main: No need to use ASMAtomicXXX routines for GuestWaitEventBase::mfAborted; check for return value of RTSemEventWait() in GuestWaitEventBase::Wait().

File:

• trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp (modified) (4 diffs)

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

@@ -1443 +1443 @@
                                        const GuestWaitEventPayload *pPayload)
 {
-    if (ASMAtomicReadBool(&mfAborted))
+    if (mfAborted)
         return VERR_CANCELLED;
 
@@ -1481 +1481 @@
     int rc = VINF_SUCCESS;
 
-    if (ASMAtomicReadBool(&mfAborted))
+    if (mfAborted)
         rc = VERR_CANCELLED;
 
@@ -1489 +1489 @@
 
         rc = RTSemEventWait(mEventSem, msTimeout ? msTimeout : RT_INDEFINITE_WAIT);
-        if (ASMAtomicReadBool(&mfAborted))
+        if (   RT_SUCCESS(rc)
+            && mfAborted)
+        {
             rc = VERR_CANCELLED;
+        }
+
         if (RT_SUCCESS(rc))
         {
@@ -1516 +1520 @@
 int GuestWaitEvent::Cancel(void)
 {
-    AssertReturn(!mfAborted, VERR_CANCELLED);
-    ASMAtomicWriteBool(&mfAborted, true);
+    if (mfAborted) /* Already aborted? */
+        return VINF_SUCCESS;
+
+    mfAborted = true;
 
 #ifdef DEBUG_andy