doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shut down on device failure (instead of suspending)

Browse Source
This commit is contained in:
Nav
2023-05-25 00:29:46 +01:00
parent 8e3f56b348
commit 3540228f6d
1 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/TargetController/TargetControllerComponent.cpp
View File

@@ -67,31 +67,14 @@ namespace Bloom::TargetController
Logger::debug("TargetController ready and waiting for events.");
while (this->getThreadState() == ThreadState::READY) {
try {
if (this->state == TargetControllerState::ACTIVE) {
this->fireTargetEvents();
}
TargetControllerComponent::notifier.waitForNotification(std::chrono::milliseconds(60));
this->processQueuedCommands();
this->eventListener->dispatchCurrentEvents();
} catch (const DeviceFailure& exception) {
/*
* Upon a device failure, we assume Bloom has lost control of the debug tool. This could be the
* result of the user disconnecting the debug tool, or issuing a soft reset. The soft reset could
* have been issued via another application, without the user's knowledge.
* See https://github.com/navnavnav/Bloom/issues/3 for more on that.
*
* The TC will go into a suspended state and the DebugServer should terminate any active debug
* session. When the user attempts to start another debug session, we will try to re-connect to the
* debug tool.
*/
Logger::error("Device failure detected - " + exception.getMessage());
Logger::error("Suspending TargetController");
this->suspend();
if (this->state == TargetControllerState::ACTIVE) {
this->fireTargetEvents();
}
TargetControllerComponent::notifier.waitForNotification(std::chrono::milliseconds(60));
this->processQueuedCommands();
this->eventListener->dispatchCurrentEvents();
}
} catch (const std::exception& exception) {
@@ -392,6 +375,14 @@ namespace Bloom::TargetController
this->registerCommandResponse(commandId, commandHandlerIt->second(*(command.get())));
} catch (const DeviceFailure& exception) {
this->registerCommandResponse(
commandId,
std::make_unique<Responses::Error>(exception.getMessage())
);
throw exception;
} catch (const Exception& exception) {
this->registerCommandResponse(
commandId,