Tidying

src/DebugServer/Gdb/Connection.cpp

@@ -184,19 +184,17 @@ namespace Bloom::DebugServer::Gdb
         std::array<unsigned char, bufferSize> buffer = {};
         ssize_t bytesRead = 0;
 
-        if (interruptible) {
-            if (this->readInterruptEnabled != interruptible) {
+        if (this->readInterruptEnabled != interruptible) {
+            if (interruptible) {
                 this->enableReadInterrupts();
 
             } else {
-                // Clear any previous interrupts that are still hanging around
-                this->interruptEventNotifier.clear();
+                this->disableReadInterrupts();
             }
         }
 
-        if (this->readInterruptEnabled != interruptible && !interruptible) {
-            this->disableReadInterrupts();
-        }
+        // Clear any previous interrupts that are still hanging around
+        this->interruptEventNotifier.clear();
 
         const auto eventFileDescriptor = this->epollInstance.waitForEvent(timeout);
 

src/DebugServer/Gdb/GdbRspDebugServer.cpp

@@ -133,7 +133,7 @@ namespace Bloom::DebugServer::Gdb
                 auto connection = this->waitForConnection();
 
                 if (!connection.has_value()) {
-                    // Likely an interrupt
+                    // Likely an interrupt - return control to DebugServerComponent::run() so it can process any events
                     return;
                 }
 
@@ -228,7 +228,7 @@ namespace Bloom::DebugServer::Gdb
 
     std::unique_ptr<CommandPacket> GdbRspDebugServer::resolveCommandPacket(const RawPacketType& rawPacket) {
         if (rawPacket.size() == 5 && rawPacket[1] == 0x03) {
-            // This is an interrupt request - create a fake packet for it
+            // Interrupt request
             return std::make_unique<CommandPackets::InterruptExecution>(rawPacket);
         }