From 1e741d18d72d4b3a587bda8d83428c2df2ce79cb Mon Sep 17 00:00:00 2001 From: Nav Date: Sat, 29 May 2021 21:39:00 +0100 Subject: [PATCH] Once again, this should have been included in a previous commit, RE renaming compnent state changed events --- src/Application.cpp | 16 ++++++++-------- src/DebugServers/DebugServer.cpp | 12 ++++++------ src/DebugServers/DebugServer.hpp | 6 +++--- src/Helpers/Thread.hpp | 6 +++--- src/Insight/Insight.cpp | 9 ++++----- src/Insight/InsightWorker.cpp | 2 +- src/SignalHandler/SignalHandler.cpp | 4 ++-- src/SignalHandler/SignalHandler.hpp | 4 ++-- src/TargetController/TargetController.cpp | 6 +++--- src/TargetController/TargetController.hpp | 8 ++++---- 10 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index eedf9c18..14677e5c 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -54,7 +54,7 @@ int Application::run(const std::vector& arguments) { } // Main event loop - while (Thread::getState() == ThreadState::READY) { + while (Thread::getThreadState() == ThreadState::READY) { this->applicationEventListener->waitAndDispatch(); } @@ -116,7 +116,7 @@ void Application::startup() { this->startTargetController(); this->startDebugServer(); - Thread::setState(ThreadState::READY); + Thread::setThreadState(ThreadState::READY); } ApplicationConfig Application::extractConfig() { @@ -208,18 +208,18 @@ int Application::initProject() { } void Application::shutdown() { - auto appState = Thread::getState(); + auto appState = Thread::getThreadState(); if (appState == ThreadState::STOPPED || appState == ThreadState::SHUTDOWN_INITIATED) { return; } - Thread::setState(ThreadState::SHUTDOWN_INITIATED); + Thread::setThreadState(ThreadState::SHUTDOWN_INITIATED); Logger::info("Shutting down Bloom"); this->stopDebugServer(); this->stopTargetController(); - if (this->signalHandler.getState() == ThreadState::READY) { + if (this->signalHandler.getThreadState() != ThreadState::STOPPED) { // Signal handler is still running this->signalHandler.triggerShutdown(); @@ -233,7 +233,7 @@ void Application::shutdown() { Logger::debug("SignalHandler thread joined"); } - Thread::setState(ThreadState::STOPPED); + Thread::setThreadState(ThreadState::STOPPED); } void Application::startTargetController() { @@ -253,7 +253,7 @@ void Application::startTargetController() { } void Application::stopTargetController() { - auto targetControllerState = this->targetController.getState(); + auto targetControllerState = this->targetController.getThreadState(); if (targetControllerState == ThreadState::STARTING || targetControllerState == ThreadState::READY) { this->eventManager.triggerEvent(std::make_shared()); this->applicationEventListener->waitForEvent( @@ -299,7 +299,7 @@ void Application::stopDebugServer() { return; } - auto debugServerState = this->debugServer->getState(); + auto debugServerState = this->debugServer->getThreadState(); if (debugServerState == ThreadState::STARTING || debugServerState == ThreadState::READY) { this->eventManager.triggerEvent(std::make_shared()); this->applicationEventListener->waitForEvent( diff --git a/src/DebugServers/DebugServer.cpp b/src/DebugServers/DebugServer.cpp index 57d9a493..ae77f553 100644 --- a/src/DebugServers/DebugServer.cpp +++ b/src/DebugServers/DebugServer.cpp @@ -14,7 +14,7 @@ void DebugServer::run() { Logger::info("DebugServer ready"); - while (this->getState() == ThreadState::READY) { + while (this->getThreadState() == ThreadState::READY) { this->serve(); this->eventListener->dispatchCurrentEvents(); } @@ -41,21 +41,21 @@ void DebugServer::startup() { ); this->init(); - this->setStateAndEmitEvent(ThreadState::READY); + this->setThreadStateAndEmitEvent(ThreadState::READY); } void DebugServer::shutdown() { - if (this->getState() == ThreadState::STOPPED || this->getState() == ThreadState::SHUTDOWN_INITIATED) { + if (this->getThreadState() == ThreadState::STOPPED || this->getThreadState() == ThreadState::SHUTDOWN_INITIATED) { return; } - this->setState(ThreadState::SHUTDOWN_INITIATED); + this->setThreadState(ThreadState::SHUTDOWN_INITIATED); Logger::info("Shutting down DebugServer"); this->close(); this->interruptEventNotifier->close(); - this->setStateAndEmitEvent(ThreadState::STOPPED); + this->setThreadStateAndEmitEvent(ThreadState::STOPPED); } void DebugServer::onShutdownDebugServerEvent(EventPointer event) { this->shutdown(); -} \ No newline at end of file +} diff --git a/src/DebugServers/DebugServer.hpp b/src/DebugServers/DebugServer.hpp index 12bb3fbc..4b78fd5a 100644 --- a/src/DebugServers/DebugServer.hpp +++ b/src/DebugServers/DebugServer.hpp @@ -47,12 +47,12 @@ namespace Bloom::DebugServers * @param state * @param emitEvent */ - void setStateAndEmitEvent(ThreadState state) { - Thread::setState(state); + void setThreadStateAndEmitEvent(ThreadState state) { + Thread::setThreadState(state); this->eventManager.triggerEvent( std::make_shared(state) ); - }; + } /** * Handles a shutdown request. diff --git a/src/Helpers/Thread.hpp b/src/Helpers/Thread.hpp index eada3da9..dfc41e96 100644 --- a/src/Helpers/Thread.hpp +++ b/src/Helpers/Thread.hpp @@ -22,7 +22,7 @@ namespace Bloom SyncSafe state = SyncSafe(ThreadState::UNINITIALISED); protected: - virtual void setState(ThreadState state) { + virtual void setThreadState(ThreadState state) { this->state.setValue(state); }; @@ -43,8 +43,8 @@ namespace Bloom } public: - virtual ThreadState getState() { + virtual ThreadState getThreadState() { return this->state.getValue(); }; }; -} \ No newline at end of file +} diff --git a/src/Insight/Insight.cpp b/src/Insight/Insight.cpp index 8e23add8..b5522f51 100644 --- a/src/Insight/Insight.cpp +++ b/src/Insight/Insight.cpp @@ -1,4 +1,3 @@ -#include #include #include @@ -18,7 +17,7 @@ void Insight::run() { this->startup(); this->workerThread->start(); - this->setState(ThreadState::READY); + this->setThreadState(ThreadState::READY); Logger::info("Insight ready"); this->application->exec(); @@ -36,7 +35,7 @@ void Insight::run() { void Insight::startup() { Logger::info("Starting Insight"); - this->setState(ThreadState::STARTING); + this->setThreadState(ThreadState::STARTING); this->eventManager.registerListener(this->eventListener); this->eventListener->registerCallbackForEventType( @@ -97,7 +96,7 @@ void Insight::startup() { } void Insight::shutdown() { - if (this->getState() == ThreadState::STOPPED) { + if (this->getThreadState() == ThreadState::STOPPED) { return; } @@ -112,7 +111,7 @@ void Insight::shutdown() { this->application->exit(0); } - this->setState(ThreadState::STOPPED); + this->setThreadState(ThreadState::STOPPED); } void Insight::onShutdownApplicationEvent(EventPointer) { diff --git a/src/Insight/InsightWorker.cpp b/src/Insight/InsightWorker.cpp index 310a01e2..fe7c17dc 100644 --- a/src/Insight/InsightWorker.cpp +++ b/src/Insight/InsightWorker.cpp @@ -40,7 +40,7 @@ void InsightWorker::startup() { this->eventDispatchTimer->start(5); this->eventManager.triggerEvent( - std::make_shared(ThreadState::READY) + std::make_shared(ThreadState::READY) ); } diff --git a/src/SignalHandler/SignalHandler.cpp b/src/SignalHandler/SignalHandler.cpp index 753dabaa..465cb23b 100644 --- a/src/SignalHandler/SignalHandler.cpp +++ b/src/SignalHandler/SignalHandler.cpp @@ -14,7 +14,7 @@ void SignalHandler::run() { int signalNumber = 0; Logger::debug("SignalHandler ready"); - while(Thread::getState() == ThreadState::READY) { + while(Thread::getThreadState() == ThreadState::READY) { if (sigwait(&signalSet, &signalNumber) == 0) { Logger::debug("SIGNAL " + std::to_string(signalNumber) + " received"); if (this->handlersMappedBySignalNum.contains(signalNumber)) { @@ -29,7 +29,7 @@ void SignalHandler::run() { } Logger::debug("SignalHandler shutting down"); - Thread::setState(ThreadState::STOPPED); + Thread::setThreadState(ThreadState::STOPPED); } void SignalHandler::startup() { diff --git a/src/SignalHandler/SignalHandler.hpp b/src/SignalHandler/SignalHandler.hpp index b3d99267..96f7db83 100644 --- a/src/SignalHandler/SignalHandler.hpp +++ b/src/SignalHandler/SignalHandler.hpp @@ -50,7 +50,7 @@ namespace Bloom * Triggers the shutdown of the SignalHandler thread. */ void triggerShutdown() { - this->setState(ThreadState::SHUTDOWN_INITIATED); + this->setThreadState(ThreadState::SHUTDOWN_INITIATED); }; /** @@ -61,4 +61,4 @@ namespace Bloom */ void triggerApplicationShutdown(); }; -} \ No newline at end of file +} diff --git a/src/TargetController/TargetController.cpp b/src/TargetController/TargetController.cpp index 044db3db..1d4b1e5c 100644 --- a/src/TargetController/TargetController.cpp +++ b/src/TargetController/TargetController.cpp @@ -16,7 +16,7 @@ void TargetController::run() { try { this->startup(); - this->setStateAndEmitEvent(ThreadState::READY); + this->setThreadStateAndEmitEvent(ThreadState::READY); Logger::debug("TargetController ready and waiting for events."); while (this->getState() == ThreadState::READY) { @@ -43,7 +43,7 @@ void TargetController::run() { void TargetController::startup() { this->setName("TC"); Logger::info("Starting TargetController"); - this->setState(ThreadState::STARTING); + this->setThreadState(ThreadState::STARTING); this->blockAllSignalsOnCurrentThread(); this->eventManager.registerListener(this->eventListener); @@ -477,7 +477,7 @@ void TargetController::onSetProgramCounterEvent(EventPointer event) { +void TargetController::onInsightStateChangedEvent(EventPointer event) { if (event->getState() == ThreadState::READY) { /* * Insight has just started up. diff --git a/src/TargetController/TargetController.hpp b/src/TargetController/TargetController.hpp index ff427ca6..55d7c3d8 100644 --- a/src/TargetController/TargetController.hpp +++ b/src/TargetController/TargetController.hpp @@ -160,12 +160,12 @@ namespace Bloom * @param state * @param emitEvent */ - void setStateAndEmitEvent(ThreadState state) { - this->setState(state); + void setThreadStateAndEmitEvent(ThreadState state) { + this->setThreadState(state); this->eventManager.triggerEvent( - std::make_shared(state) + std::make_shared(state) ); - }; + } /** * Installs Bloom's udev rules on user's machine. Rules are copied from build/Distribution/Resources/UdevRules