General tidying, addressing issues found by static analysis tool.
This commit is contained in:
@@ -86,6 +86,7 @@ void EventListener::waitAndDispatch(int msTimeout) {
|
||||
|
||||
if (msTimeout > 0) {
|
||||
this->eventQueueByEventTypeCV.wait_for(queueLock, std::chrono::milliseconds(msTimeout), eventsFound);
|
||||
|
||||
} else {
|
||||
this->eventQueueByEventTypeCV.wait(queueLock, eventsFound);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ using namespace Bloom;
|
||||
|
||||
void EventManager::registerListener(std::shared_ptr<EventListener> listener) {
|
||||
auto registerListenersLock = std::unique_lock(this->registerListenerMutex);
|
||||
this->registeredListeners.insert(std::pair(listener->getId(), listener));
|
||||
this->registeredListeners.insert(std::pair(listener->getId(), std::move(listener)));
|
||||
}
|
||||
|
||||
void EventManager::deregisterListener(size_t listenerId) {
|
||||
@@ -12,10 +12,11 @@ void EventManager::deregisterListener(size_t listenerId) {
|
||||
this->registeredListeners.erase(listenerId);
|
||||
}
|
||||
|
||||
void EventManager::triggerEvent(std::shared_ptr<const Events::Event> event) {
|
||||
void EventManager::triggerEvent(const std::shared_ptr<const Events::Event>& event) {
|
||||
auto registerListenersLock = std::unique_lock(this->registerListenerMutex);
|
||||
for(auto const& [listenerId, listener] : this->registeredListeners) {
|
||||
auto registeredEventTypes = listener->getRegisteredEventTypeNames();
|
||||
|
||||
if (registeredEventTypes.contains(event->getName())) {
|
||||
listener->registerEvent(event);
|
||||
}
|
||||
|
||||
@@ -53,7 +53,6 @@ namespace Bloom
|
||||
*
|
||||
* @param event
|
||||
*/
|
||||
void triggerEvent(Events::SharedGenericEventPointer event);
|
||||
void triggerEvent(const Events::SharedGenericEventPointer& event);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "BreakpointRemovedOnTarget";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return BreakpointRemovedOnTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "BreakpointSetOnTarget";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return BreakpointSetOnTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,15 +12,15 @@ namespace Bloom::Events
|
||||
private:
|
||||
ThreadState state;
|
||||
public:
|
||||
DebugServerThreadStateChanged(ThreadState state): state(state) {};
|
||||
explicit DebugServerThreadStateChanged(ThreadState state): state(state) {};
|
||||
|
||||
static inline const std::string name = "DebugServerThreadStateChanged";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return DebugServerThreadStateChanged::name;
|
||||
}
|
||||
|
||||
ThreadState getState() const {
|
||||
[[nodiscard]] ThreadState getState() const {
|
||||
return this->state;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "DebugSessionFinished";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return DebugSessionFinished::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "DebugSessionStarted";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return DebugSessionStarted::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "ExtractTargetDescriptor";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return ExtractTargetDescriptor::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,11 +12,11 @@ namespace Bloom::Events
|
||||
private:
|
||||
ThreadState state;
|
||||
public:
|
||||
InsightThreadStateChanged(ThreadState state): state(state) {};
|
||||
explicit InsightThreadStateChanged(ThreadState state): state(state) {};
|
||||
|
||||
static inline const std::string name = "InsightThreadStateChanged";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return InsightThreadStateChanged::name;
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
||||
static inline const std::string name = "MemoryRetrievedFromTarget";
|
||||
Targets::TargetMemoryBuffer data;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return MemoryRetrievedFromTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "MemoryWrittenToTarget";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return MemoryWrittenToTarget::name;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "ProgramCounterSetOnTarget";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return ProgramCounterSetOnTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
||||
static inline const std::string name = "RegistersRetrievedFromTarget";
|
||||
Targets::TargetRegisters registers;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return RegistersRetrievedFromTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "RegistersWrittenToTarget";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return RegistersWrittenToTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,10 +12,9 @@ namespace Bloom::Events
|
||||
{
|
||||
public:
|
||||
static inline const std::string name = "RemoveBreakpointOnTarget";
|
||||
std::uint32_t address;
|
||||
Targets::TargetBreakpoint breakpoint;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return RemoveBreakpointOnTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
||||
|
||||
static inline const std::string name = "ReportTargetControllerState";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return ReportTargetControllerState::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "ResetTargetEvent";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return ResetTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,11 +13,11 @@ namespace Bloom::Events
|
||||
static inline const std::string name = "ResumeTargetExecutionEvent";
|
||||
std::optional<std::uint32_t> fromProgramCounter;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return ResumeTargetExecution::name;
|
||||
}
|
||||
|
||||
ResumeTargetExecution() = default;
|
||||
ResumeTargetExecution(std::uint32_t fromProgramCounter): fromProgramCounter(fromProgramCounter) {};
|
||||
explicit ResumeTargetExecution(std::uint32_t fromProgramCounter): fromProgramCounter(fromProgramCounter) {};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,10 +13,10 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "RetrieveMemoryFromTarget";
|
||||
Targets::TargetMemoryType memoryType = Targets::TargetMemoryType::RAM;
|
||||
std::uint32_t startAddress;
|
||||
std::uint32_t bytes;
|
||||
std::uint32_t startAddress = 0;
|
||||
std::uint32_t bytes = 0;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return RetrieveMemoryFromTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
||||
static inline const std::string name = "RetrieveRegistersFromTarget";
|
||||
Targets::TargetRegisterDescriptors descriptors;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return RetrieveRegistersFromTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -10,9 +10,9 @@ namespace Bloom::Events
|
||||
{
|
||||
public:
|
||||
static inline const std::string name = "RetrieveTargetPinStates";
|
||||
int variantId;
|
||||
int variantId = 0;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return RetrieveTargetPinStates::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,10 +12,9 @@ namespace Bloom::Events
|
||||
{
|
||||
public:
|
||||
static inline const std::string name = "SetBreakpointOnTarget";
|
||||
std::uint32_t address;
|
||||
Targets::TargetBreakpoint breakpoint;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return SetBreakpointOnTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,9 +11,9 @@ namespace Bloom::Events
|
||||
{
|
||||
public:
|
||||
static inline const std::string name = "SetProgramCounterOnTarget";
|
||||
std::uint32_t address;
|
||||
std::uint32_t address = 0;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return SetProgramCounterOnTarget::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,11 +11,11 @@ namespace Bloom::Events
|
||||
{
|
||||
public:
|
||||
static inline const std::string name = "SetTargetPinState";
|
||||
int variantId;
|
||||
int variantId = 0;
|
||||
Targets::TargetPinDescriptor pinDescriptor;
|
||||
Targets::TargetPinState pinState;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return SetTargetPinState::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "ShutdownApplicationEvent";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return ShutdownApplication::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "ShutdownDebugServer";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return ShutdownDebugServer::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "ShutdownTargetControllerEvent";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return ShutdownTargetController::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,11 +13,11 @@ namespace Bloom::Events
|
||||
static inline const std::string name = "StepTargetExecution";
|
||||
std::optional<std::uint32_t> fromProgramCounter;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return StepTargetExecution::name;
|
||||
}
|
||||
|
||||
StepTargetExecution() = default;
|
||||
StepTargetExecution(std::uint32_t fromProgramCounter): fromProgramCounter(fromProgramCounter) {};
|
||||
explicit StepTargetExecution(std::uint32_t fromProgramCounter): fromProgramCounter(fromProgramCounter) {};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "StopTargetEvent";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return StopTargetExecution::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
||||
|
||||
TargetControllerErrorOccurred() = default;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return TargetControllerErrorOccurred::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,11 +12,11 @@ namespace Bloom::Events
|
||||
public:
|
||||
TargetControllerState state;
|
||||
|
||||
TargetControllerStateReported(TargetControllerState state): state(state) {};
|
||||
explicit TargetControllerStateReported(TargetControllerState state): state(state) {};
|
||||
|
||||
static inline const std::string name = "TargetControllerStateReported";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return TargetControllerStateReported::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,11 +13,11 @@ namespace Bloom::Events
|
||||
ThreadState state;
|
||||
|
||||
public:
|
||||
TargetControllerThreadStateChanged(ThreadState state): state(state) {};
|
||||
explicit TargetControllerThreadStateChanged(ThreadState state): state(state) {};
|
||||
|
||||
static inline const std::string name = "TargetControllerThreadStateChanged";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return TargetControllerThreadStateChanged::name;
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
||||
static inline const std::string name = "TargetDescriptorExtracted";
|
||||
Targets::TargetDescriptor targetDescriptor;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return TargetDescriptorExtracted::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
||||
|
||||
TargetExecutionResumed() = default;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return TargetExecutionResumed::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -18,7 +18,7 @@ namespace Bloom::Events
|
||||
TargetExecutionStopped(std::uint32_t programCounter, Targets::TargetBreakCause breakCause) :
|
||||
programCounter(programCounter), breakCause(breakCause) {}
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return TargetExecutionStopped::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
||||
public:
|
||||
static inline const std::string name = "TargetIoPortsUpdated";
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return TargetIoPortsUpdated::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,10 +12,10 @@ namespace Bloom::Events
|
||||
{
|
||||
public:
|
||||
static inline const std::string name = "TargetPinStatesRetrieved";
|
||||
int variantId;
|
||||
int variantId = 0;
|
||||
std::map<int, Targets::TargetPinState> pinSatesByNumber;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return TargetPinStatesRetrieved::name;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "Event.hpp"
|
||||
#include "src/Targets/TargetMemory.hpp"
|
||||
@@ -12,11 +13,11 @@ namespace Bloom::Events
|
||||
{
|
||||
public:
|
||||
static inline const std::string name = "WriteMemoryToTarget";
|
||||
Targets::TargetMemoryType memoryType;
|
||||
std::uint32_t startAddress;
|
||||
Targets::TargetMemoryType memoryType = Targets::TargetMemoryType::RAM;
|
||||
std::uint32_t startAddress = 0;
|
||||
Targets::TargetMemoryBuffer buffer;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return WriteMemoryToTarget::name;
|
||||
}
|
||||
|
||||
@@ -24,7 +25,7 @@ namespace Bloom::Events
|
||||
WriteMemoryToTarget(
|
||||
Targets::TargetMemoryType memoryType,
|
||||
std::uint32_t startAddress,
|
||||
const Targets::TargetMemoryBuffer& buffer
|
||||
): memoryType(memoryType), startAddress(startAddress), buffer(buffer) {};
|
||||
Targets::TargetMemoryBuffer buffer
|
||||
): memoryType(memoryType), startAddress(startAddress), buffer(std::move(buffer)) {};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "Event.hpp"
|
||||
#include "src/Targets/TargetRegister.hpp"
|
||||
@@ -13,11 +14,11 @@ namespace Bloom::Events
|
||||
static inline const std::string name = "WriteRegistersToTarget";
|
||||
Targets::TargetRegisters registers;
|
||||
|
||||
std::string getName() const override {
|
||||
[[nodiscard]] std::string getName() const override {
|
||||
return WriteRegistersToTarget::name;
|
||||
}
|
||||
|
||||
WriteRegistersToTarget() = default;
|
||||
WriteRegistersToTarget(const Targets::TargetRegisters& registers): registers(registers) {};
|
||||
explicit WriteRegistersToTarget(Targets::TargetRegisters registers): registers(std::move(registers)) {};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user