More tidying

This commit is contained in:
Nav
2022-04-05 22:37:00 +01:00
parent b8e34b87d3
commit 7b5ce83b50
5 changed files with 8 additions and 3 deletions

View File

@@ -88,6 +88,8 @@ namespace Bloom::DebugServer
Logger::info("Shutting down DebugServer"); Logger::info("Shutting down DebugServer");
this->server->close(); this->server->close();
this->setThreadStateAndEmitEvent(ThreadState::STOPPED); this->setThreadStateAndEmitEvent(ThreadState::STOPPED);
this->eventListener->setInterruptEventNotifier(nullptr);
EventManager::deregisterListener(this->eventListener->getId()); EventManager::deregisterListener(this->eventListener->getId());
} }

View File

@@ -1,7 +1,7 @@
#include "Connection.hpp" #include "Connection.hpp"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/epoll.h> #include <unistd.h>
#include <cerrno> #include <cerrno>
#include <fcntl.h> #include <fcntl.h>

View File

@@ -1,6 +1,7 @@
#include "GdbRspDebugServer.hpp" #include "GdbRspDebugServer.hpp"
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h>
#include "src/Logger/Logger.hpp" #include "src/Logger/Logger.hpp"
@@ -42,7 +43,7 @@ namespace Bloom::DebugServer::Gdb
, eventListener(eventListener) , eventListener(eventListener)
, interruptEventNotifier(eventListener.getInterruptEventNotifier()) , interruptEventNotifier(eventListener.getInterruptEventNotifier())
{ {
assert(this->interruptEventNotifier != nullptr && this->interruptEventNotifier->isInitialised()); assert(this->interruptEventNotifier != nullptr);
} }
void GdbRspDebugServer::init() { void GdbRspDebugServer::init() {

View File

@@ -19,7 +19,7 @@ namespace Bloom
eventQueueByType[event->getType()].push(std::move(event)); eventQueueByType[event->getType()].push(std::move(event));
this->eventQueueByEventTypeCV.notify_all(); this->eventQueueByEventTypeCV.notify_all();
if (this->interruptEventNotifier != nullptr && this->interruptEventNotifier->isInitialised()) { if (this->interruptEventNotifier != nullptr) {
this->interruptEventNotifier->notify(); this->interruptEventNotifier->notify();
} }
} }

View File

@@ -15,6 +15,8 @@
#include "src/Targets/TargetState.hpp" #include "src/Targets/TargetState.hpp"
#include "src/Targets/TargetPinDescriptor.hpp" #include "src/Targets/TargetPinDescriptor.hpp"
#include "src/Exceptions/Exception.hpp"
namespace Bloom namespace Bloom
{ {
/** /**