Replaced RemoveBreakpointOnTarget event with TC command

src/EventManager/Events/BreakpointRemovedOnTarget.hpp

@@ -1,23 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include "Event.hpp"
-
-namespace Bloom::Events
-{
-    class BreakpointRemovedOnTarget: public Event
-    {
-    public:
-        static constexpr EventType type = EventType::BREAKPOINT_REMOVED_ON_TARGET;
-        static inline const std::string name = "BreakpointRemovedOnTarget";
-
-        [[nodiscard]] EventType getType() const override {
-            return BreakpointRemovedOnTarget::type;
-        }
-
-        [[nodiscard]] std::string getName() const override {
-            return BreakpointRemovedOnTarget::name;
-        }
-    };
-}

src/EventManager/Events/Event.hpp

@@ -29,8 +29,6 @@ namespace Bloom::Events
         TARGET_EXECUTION_RESUMED,
         TARGET_EXECUTION_STOPPED,
         MEMORY_WRITTEN_TO_TARGET,
-        REMOVE_BREAKPOINT_ON_TARGET,
-        BREAKPOINT_REMOVED_ON_TARGET,
         SET_PROGRAM_COUNTER_ON_TARGET,
         PROGRAM_COUNTER_SET_ON_TARGET,
         EXTRACT_TARGET_DESCRIPTOR,

src/EventManager/Events/Events.hpp

@@ -16,8 +16,6 @@
 #include "TargetExecutionResumed.hpp"
 #include "TargetExecutionStopped.hpp"
 #include "MemoryWrittenToTarget.hpp"
-#include "RemoveBreakpointOnTarget.hpp"
-#include "BreakpointRemovedOnTarget.hpp"
 #include "SetProgramCounterOnTarget.hpp"
 #include "ProgramCounterSetOnTarget.hpp"
 #include "ExtractTargetDescriptor.hpp"

src/EventManager/Events/RemoveBreakpointOnTarget.hpp

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-
-#include "Event.hpp"
-#include "BreakpointRemovedOnTarget.hpp"
-#include "src/Targets/TargetBreakpoint.hpp"
-
-namespace Bloom::Events
-{
-    class RemoveBreakpointOnTarget: public Event
-    {
-    public:
-        using TargetControllerResponseType = BreakpointRemovedOnTarget;
-
-        static constexpr EventType type = EventType::REMOVE_BREAKPOINT_ON_TARGET;
-        static inline const std::string name = "RemoveBreakpointOnTarget";
-        Targets::TargetBreakpoint breakpoint;
-
-        [[nodiscard]] EventType getType() const override {
-            return RemoveBreakpointOnTarget::type;
-        }
-
-        [[nodiscard]] std::string getName() const override {
-            return RemoveBreakpointOnTarget::name;
-        }
-    };
-}

src/TargetController/Commands/CommandTypes.hpp

@@ -18,5 +18,6 @@ namespace Bloom::TargetController::Commands
         STEP_TARGET_EXECUTION,
         WRITE_TARGET_MEMORY,
         SET_BREAKPOINT,
+        REMOVE_BREAKPOINT,
     };
 }

src/TargetController/Commands/RemoveBreakpoint.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+#include "Command.hpp"
+
+#include "src/Targets/TargetBreakpoint.hpp"
+
+namespace Bloom::TargetController::Commands
+{
+    class RemoveBreakpoint: public Command
+    {
+    public:
+        static constexpr CommandType type = CommandType::REMOVE_BREAKPOINT;
+        static inline const std::string name = "RemoveBreakpoint";
+
+        Targets::TargetBreakpoint breakpoint;
+
+        RemoveBreakpoint() = default;
+        explicit RemoveBreakpoint(const Targets::TargetBreakpoint& breakpoint)
+            : breakpoint(breakpoint)
+        {};
+
+        [[nodiscard]] CommandType getType() const override {
+            return RemoveBreakpoint::type;
+        }
+
+        [[nodiscard]] bool requiresStoppedTargetState() const override {
+            return true;
+        }
+    };
+}

src/TargetController/TargetControllerComponent.cpp

@@ -32,6 +32,7 @@ namespace Bloom::TargetController
     using Commands::WriteTargetMemory;
     using Commands::StepTargetExecution;
     using Commands::SetBreakpoint;
+    using Commands::RemoveBreakpoint;
 
     using Responses::Response;
     using Responses::TargetRegistersRead;
@@ -395,10 +396,10 @@ namespace Bloom::TargetController
         this->deregisterCommandHandler(WriteTargetMemory::type);
         this->deregisterCommandHandler(StepTargetExecution::type);
         this->deregisterCommandHandler(SetBreakpoint::type);
+        this->deregisterCommandHandler(RemoveBreakpoint::type);
 
         this->eventListener->deregisterCallbacksForEventType<Events::DebugSessionFinished>();
         this->eventListener->deregisterCallbacksForEventType<Events::ExtractTargetDescriptor>();
-        this->eventListener->deregisterCallbacksForEventType<Events::RemoveBreakpointOnTarget>();
         this->eventListener->deregisterCallbacksForEventType<Events::SetProgramCounterOnTarget>();
         this->eventListener->deregisterCallbacksForEventType<Events::InsightThreadStateChanged>();
         this->eventListener->deregisterCallbacksForEventType<Events::RetrieveTargetPinStates>();
@@ -460,6 +461,10 @@ namespace Bloom::TargetController
             std::bind(&TargetControllerComponent::handleSetBreakpoint, this, std::placeholders::_1)
         );
 
+        this->registerCommandHandler<RemoveBreakpoint>(
+            std::bind(&TargetControllerComponent::handleRemoveBreakpoint, this, std::placeholders::_1)
+        );
+
         this->eventListener->registerCallbackForEventType<Events::DebugSessionFinished>(
             std::bind(&TargetControllerComponent::onDebugSessionFinishedEvent, this, std::placeholders::_1)
         );
@@ -468,10 +473,6 @@ namespace Bloom::TargetController
             std::bind(&TargetControllerComponent::onExtractTargetDescriptor, this, std::placeholders::_1)
         );
 
-        this->eventListener->registerCallbackForEventType<Events::RemoveBreakpointOnTarget>(
-            std::bind(&TargetControllerComponent::onRemoveBreakpointEvent, this, std::placeholders::_1)
-        );
-
         this->eventListener->registerCallbackForEventType<Events::SetProgramCounterOnTarget>(
             std::bind(&TargetControllerComponent::onSetProgramCounterEvent, this, std::placeholders::_1)
         );
@@ -865,18 +866,9 @@ namespace Bloom::TargetController
         return std::make_unique<Response>();
     }
 
-    void TargetControllerComponent::onRemoveBreakpointEvent(const Events::RemoveBreakpointOnTarget& event) {
+    std::unique_ptr<Response> TargetControllerComponent::handleRemoveBreakpoint(RemoveBreakpoint& command) {
-        try {
+        this->target->removeBreakpoint(command.breakpoint.address);
-            this->target->removeBreakpoint(event.breakpoint.address);
+        return std::make_unique<Response>();
-            auto breakpointRemovedEvent = std::make_shared<Events::BreakpointRemovedOnTarget>();
-            breakpointRemovedEvent->correlationId = event.id;
-
-            EventManager::triggerEvent(breakpointRemovedEvent);
-
-        } catch (const TargetOperationFailure& exception) {
-            Logger::error("Failed to remove breakpoint on target - " + exception.getMessage());
-            this->emitErrorEvent(event.id, exception.getMessage());
-        }
     }
 
     void TargetControllerComponent::onSetProgramCounterEvent(const Events::SetProgramCounterOnTarget& event) {

src/TargetController/TargetControllerComponent.hpp

@@ -28,6 +28,7 @@
 #include "Commands/WriteTargetMemory.hpp"
 #include "Commands/StepTargetExecution.hpp"
 #include "Commands/SetBreakpoint.hpp"
+#include "Commands/RemoveBreakpoint.hpp"
 
 // Responses
 #include "Responses/Response.hpp"
@@ -308,14 +309,7 @@ namespace Bloom::TargetController
         std::unique_ptr<Responses::Response> handleWriteTargetMemory(Commands::WriteTargetMemory& command);
         std::unique_ptr<Responses::Response> handleStepTargetExecution(Commands::StepTargetExecution& command);
         std::unique_ptr<Responses::Response> handleSetBreakpoint(Commands::SetBreakpoint& command);
-
+        std::unique_ptr<Responses::Response> handleRemoveBreakpoint(Commands::RemoveBreakpoint& command);
-        /**
-         * Will attempt to remove a breakpoint at the specified address, on the target. On success, the
-         * BreakpointRemovedOnTarget event is emitted.
-         *
-         * @param event
-         */
-        void onRemoveBreakpointEvent(const Events::RemoveBreakpointOnTarget& event);
 
         /**
          * Will update the program counter value on the target. On success, a ProgramCounterSetOnTarget event is

src/TargetController/TargetControllerConsole.cpp

@@ -15,6 +15,7 @@
 #include "Commands/WriteTargetMemory.hpp"
 #include "Commands/StepTargetExecution.hpp"
 #include "Commands/SetBreakpoint.hpp"
+#include "Commands/RemoveBreakpoint.hpp"
 
 #include "src/Logger/Logger.hpp"
 
@@ -34,6 +35,7 @@ namespace Bloom::TargetController
     using Commands::WriteTargetMemory;
     using Commands::StepTargetExecution;
     using Commands::SetBreakpoint;
+    using Commands::RemoveBreakpoint;
 
     TargetControllerConsole::TargetControllerConsole(EventListener& eventListener)
         : eventListener(eventListener)
@@ -148,10 +150,10 @@ namespace Bloom::TargetController
     }
 
     void TargetControllerConsole::removeBreakpoint(TargetBreakpoint breakpoint) {
-        auto event = std::make_shared<RemoveBreakpointOnTarget>();
+        this->commandManager.sendCommandAndWaitForResponse(
-        event->breakpoint = breakpoint;
+            std::make_unique<RemoveBreakpoint>(breakpoint),
-
+            this->defaultTimeout
-        this->triggerTargetControllerEventAndWaitForResponse(event);
+        );
     }
 
     Targets::TargetPinStateMappingType TargetControllerConsole::getPinStates(int variantId) {