Changeset 79048 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 8, 2019 2:11:28 AM (6 years ago)

Author:

vboxsync

Message:

Main/EventImpl.cpp: nits

File:

• trunk/src/VBox/Main/src-all/EventImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-all/EventImpl.cpp

@@ -118 +118 @@
     m->mProcessed = !aWaitable;
 
-    do {
+    do
+    {
         if (aWaitable)
         {
@@ -806 +807 @@
             mQueue.pop_front();
 
-            BOOL aWaitable = FALSE;
-            aEvent->COMGETTER(Waitable)(&aWaitable);
-            if (aWaitable)
+            BOOL fWaitable = FALSE;
+            aEvent->COMGETTER(Waitable)(&fWaitable);
+            if (fWaitable)
             {
                 PendingEventsMap::iterator pit = aPem->find(aEvent);
@@ -1114 +1115 @@
                                BOOL *aResult)
 {
-
-    HRESULT hrc = S_OK;
-    BOOL aWaitable = FALSE;
-    aEvent->COMGETTER(Waitable)(&aWaitable);
-
-    do {
+    /* Get event attributes before take the source lock: */
+    BOOL fWaitable = FALSE;
+    HRESULT hrc = aEvent->COMGETTER(Waitable)(&fWaitable);
+    AssertComRC(hrc);
+
+    VBoxEventType_T evType;
+    hrc = aEvent->COMGETTER(Type)(&evType);
+    AssertComRCReturn(hrc, hrc);
+
+    {
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -1126 +1131 @@
                             tr("This event source is already shut down"));
 
-        VBoxEventType_T evType;
-        hrc = aEvent->COMGETTER(Type)(&evType);
-        AssertComRCReturn(hrc, hrc);
-
         EventMapList &listeners = m->mEvMap[(int)evType - FirstEvent];
 
@@ -1137 +1138 @@
         {
             aEvent->SetProcessed();
-            break; // just leave the lock and update event object state
-        }
-
-        PendingEventsMap::iterator pit;
-
-        if (aWaitable)
-        {
-            m->mPendingMap.insert(PendingEventsMap::value_type(aEvent, cListeners));
-            // we keep iterator here to allow processing active listeners without
-            // pending events lookup
-            pit = m->mPendingMap.find(aEvent);
-        }
-        for (EventMapList::iterator it = listeners.begin();
-             it != listeners.end();
-             ++it)
-        {
-            HRESULT cbRc;
-            // keep listener record reference, in case someone will remove it while in callback
-            RecordHolder<ListenerRecord> record(*it);
-
-            /*
-             * We pass lock here to allow modifying ops on EventSource inside callback
-             * in active mode. Note that we expect list iterator stability as 'alock'
-             * could be temporary released when calling event handler.
-             */
-            cbRc = record.obj()->process(aEvent, aWaitable, pit, alock);
-
-            /* Note that E_ABORT is used above to signal that a passive
-             * listener was unregistered due to not picking up its event.
-             * This overlaps with XPCOM specific use of E_ABORT to signal
-             * death of an active listener, but that's irrelevant here. */
-            if (FAILED_DEAD_INTERFACE(cbRc) || cbRc == E_ABORT)
+            // just leave the lock and update event object state
+        }
+        else
+        {
+            PendingEventsMap::iterator pit;
+            if (fWaitable)
             {
-                Listeners::iterator lit = m->mListeners.find(record.obj()->mListener);
-                if (lit != m->mListeners.end())
+                m->mPendingMap.insert(PendingEventsMap::value_type(aEvent, cListeners));
+                // we keep iterator here to allow processing active listeners without
+                // pending events lookup
+                pit = m->mPendingMap.find(aEvent);
+            }
+
+            for (EventMapList::iterator it = listeners.begin();
+                 it != listeners.end();
+                 ++it)
+            {
+                // keep listener record reference, in case someone will remove it while in callback
+                RecordHolder<ListenerRecord> record(*it);
+
+                /*
+                 * We pass lock here to allow modifying ops on EventSource inside callback
+                 * in active mode. Note that we expect list iterator stability as 'alock'
+                 * could be temporary released when calling event handler.
+                 */
+                HRESULT cbRc = record.obj()->process(aEvent, fWaitable, pit, alock);
+
+                /* Note that E_ABORT is used above to signal that a passive
+                 * listener was unregistered due to not picking up its event.
+                 * This overlaps with XPCOM specific use of E_ABORT to signal
+                 * death of an active listener, but that's irrelevant here. */
+                if (FAILED_DEAD_INTERFACE(cbRc) || cbRc == E_ABORT)
                 {
-                    lit->second.obj()->shutdown();
-                    m->mListeners.erase(lit);
+                    Listeners::iterator lit = m->mListeners.find(record.obj()->mListener);
+                    if (lit != m->mListeners.end())
+                    {
+                        lit->second.obj()->shutdown();
+                        m->mListeners.erase(lit);
+                    }
                 }
+                // anything else to do with cbRc?
             }
-            // anything else to do with cbRc?
-        }
-    } while (0);
+        }
+    }
     /* We leave the lock here */
 
-    if (aWaitable)
+    if (fWaitable)
         hrc = aEvent->WaitProcessed(aTimeout, aResult);
     else
@@ -1218 +1220 @@
                                     const ComPtr<IEvent> &aEvent)
 {
+    BOOL fWaitable = FALSE;
+    HRESULT hrc = aEvent->COMGETTER(Waitable)(&fWaitable);
+    AssertComRC(hrc);
+
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -1225 +1231 @@
 
     Listeners::iterator it = m->mListeners.find(aListener);
-    HRESULT rc;
-
-    BOOL aWaitable = FALSE;
-    aEvent->COMGETTER(Waitable)(&aWaitable);
 
     if (it != m->mListeners.end())
@@ -1238 +1240 @@
                             tr("Only applicable to passive listeners"));
 
-        if (aWaitable)
+        if (fWaitable)
         {
             PendingEventsMap::iterator pit = m->mPendingMap.find(aEvent);
@@ -1245 +1247 @@
             {
                 AssertFailed();
-                rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                              tr("Unknown event"));
+                hrc = setError(VBOX_E_OBJECT_NOT_FOUND,
+                               tr("Unknown event"));
             }
             else
-                rc = aRecord->eventProcessed(aEvent, pit);
+                hrc = aRecord->eventProcessed(aEvent, pit);
         }
         else
         {
             // for non-waitable events we're done
-            rc = S_OK;
+            hrc = S_OK;
         }
     }
     else
-    {
-        rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                      tr("Listener was never registered"));
-    }
-
-    return rc;
+        hrc = setError(VBOX_E_OBJECT_NOT_FOUND,
+                       tr("Listener was never registered"));
+
+    return hrc;
 }