Tidying

src/EventManager/EventListener.hpp

@@ -63,10 +63,11 @@ namespace Bloom
 
         /**
          * A mapping of event type names to a vector of callback functions. Events will be dispatched to these
-         * callback functions, during a call to EventListener::waiteAndDispatch().
+         * callback functions, during a call to EventListener::dispatchEvent().
          *
-         * Each callback will be passed an std::shared_ptr<const EventType> of the event (we downcast the events in
-         * EventListener::waiteAndDispatch() before dispatching them).
+         * Each callback will be passed an std::shared_ptr<const EventType> of the event (we wrap all registered
+         * callbacks in a lambda, where we perform a downcast before invoking the callback.
+         * See EventListener::registerCallbackForEventType() for more)
          */
         SyncSafe<std::map<std::string, std::vector<std::function<void(Events::GenericEventPointer)>>>> eventTypeToCallbacksMapping;
         SyncSafe<std::set<std::string>> registeredEventTypes;

src/EventManager/Events/BreakpointRemovedOnTarget.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/BreakpointSetOnTarget.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <set>
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/DebugServerThreadStateChanged.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 #include "src/Helpers/Thread.hpp"
 

src/EventManager/Events/DebugSessionFinished.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/DebugSessionStarted.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/Events.hpp

@@ -9,7 +9,6 @@
 #include "DebugSessionStarted.hpp"
 #include "DebugSessionFinished.hpp"
 #include "TargetControllerThreadStateChanged.hpp"
-#include "TargetControllerStopped.hpp"
 #include "ShutdownTargetController.hpp"
 #include "TargetControllerErrorOccurred.hpp"
 #include "ShutdownApplication.hpp"

src/EventManager/Events/ExtractTargetDescriptor.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 

src/EventManager/Events/InsightStateChanged.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 #include "src/Helpers/Thread.hpp"
 

src/EventManager/Events/MemoryRetrievedFromTarget.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vector>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetMemory.hpp"

src/EventManager/Events/MemoryWrittenToTarget.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 #include "src/Targets/TargetMemory.hpp"
 

src/EventManager/Events/ProgramCounterSetOnTarget.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/RegistersRetrievedFromTarget.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vector>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetRegister.hpp"

src/EventManager/Events/RegistersWrittenToTarget.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <set>
+#include <string>
 
 #include "Event.hpp"
 

src/EventManager/Events/RemoveBreakpointOnTarget.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetBreakpoint.hpp"

src/EventManager/Events/ResetTarget.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/ResumeTargetExecution.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 

src/EventManager/Events/RetrieveMemoryFromTarget.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetMemory.hpp"

src/EventManager/Events/RetrieveRegistersFromTarget.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <set>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetRegister.hpp"

src/EventManager/Events/RetrieveTargetPinStates.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 

src/EventManager/Events/SetBreakpointOnTarget.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetBreakpoint.hpp"

src/EventManager/Events/SetProgramCounterOnTarget.hpp

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/SetTargetPinState.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetPinDescriptor.hpp"

src/EventManager/Events/ShutdownApplication.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/ShutdownDebugServer.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/ShutdownTargetController.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/StepTargetExecution.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 

src/EventManager/Events/StopTargetExecution.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/TargetControllerErrorOccurred.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/TargetControllerStopped.hpp

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "Event.hpp"
-#include "src/Exceptions/Exception.hpp"
-
-namespace Bloom::Events
-{
-    class TargetControllerStopped: public Event
-    {
-    private:
-        bool stoppedAbruptly = false;
-        std::optional<Exceptions::Exception> caughtException;
-
-    public:
-        static inline const std::string name = "TargetControllerStoppedEvent";
-
-        std::string getName() const override {
-            return TargetControllerStopped::name;
-        }
-    };
-}

src/EventManager/Events/TargetDescriptorExtracted.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetDescriptor.hpp"

src/EventManager/Events/TargetExecutionResumed.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "Event.hpp"
 
 namespace Bloom::Events

src/EventManager/Events/TargetExecutionStopped.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/Target.hpp"

src/EventManager/Events/TargetPinStatesRetrieved.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <cstdint>
 #include <map>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetPinDescriptor.hpp"

src/EventManager/Events/WriteMemoryToTarget.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetMemory.hpp"

src/EventManager/Events/WriteRegistersToTarget.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <set>
+#include <string>
 
 #include "Event.hpp"
 #include "src/Targets/TargetRegister.hpp"