Changeset 85286 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Jul 12, 2020 11:08:50 PM (5 years ago)

Author:

vboxsync

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

139263

Message:

Main: Refactored the generated event code implementation as Clang 11 claims va_start() on an VBoxEventType_T may trigger undefined behaviour due to type promotion (or something to that effect), but also because that variadict approach was horrible from the start. Refactored code as a dedicated factory method for each event, removing a dependency on VBoxEventDesc in veto cases. The fireXxxxEvent functions now return a HRESULT are no longer DECLINLINE (no need to compile all of them all the time). Reusable events got a ReinitXxxxxEvent function for helping with that. The VirtualBox::CallbackEvent stuff was a horrid misdesign from the start, it could've been done with a single class carrying a VBoxEventDesc member that the i_onXxxx methods would init() with all the event specific parameters and stuff. Refactored code passes a IEvent around, as that's even easier. I've left much of the old code in place for reference, but will remove once I've had a chance to test it a bit more (still struggling building VBox on the mac). bugref:9790

File:

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

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

@@ -58 +58 @@
 #include "AutoCaller.h"
 #include "LoggingNew.h"
+#include "VBoxEvents.h"
 
 #include <iprt/asm.h>
@@ -1073 +1074 @@
     m->mListeners.insert(Listeners::value_type((IEventListener *)aListener, lrh));
 
-    VBoxEventDesc evDesc;
-    evDesc.init(this, VBoxEventType_OnEventSourceChanged, (IEventListener *)aListener, TRUE);
-    evDesc.fire(0);
+    fireEventSourceChangedEvent(this, (IEventListener *)aListener, TRUE /*add*/);
 
     return S_OK;
@@ -1093 +1092 @@
         m->mListeners.erase(it);
         // destructor removes refs from the event map
+        fireEventSourceChangedEvent(this, (IEventListener *)aListener, FALSE /*add*/);
         rc = S_OK;
     }
     else
-    {
         rc = setError(VBOX_E_OBJECT_NOT_FOUND,
                       tr("Listener was never registered"));
-    }
-
-    if (SUCCEEDED(rc))
-    {
-        VBoxEventDesc evDesc;
-        evDesc.init(this, VBoxEventType_OnEventSourceChanged, (IEventListener *)aListener, FALSE);
-        evDesc.fire(0);
-    }
 
     return rc;