caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

First stab at dynamic timeout.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-07-17 11:06:21 +02:00
parent 44ae79bd50
commit ac10bdc01c
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -208,31 +208,32 @@ public class RuffyScripter {
}, cmd.toString()); }, cmd.toString());
cmdThread.start(); cmdThread.start();
long timeout = System.currentTimeMillis() + 60 * 1000; // time out if nothing has been happening for more than 30s or after 4m
long dynamicTimeout = System.currentTimeMillis() + 30 * 1000;
long overallTimeout = System.currentTimeMillis() + 4 * 60 * 1000;
while (cmdThread.isAlive()) { while (cmdThread.isAlive()) {
log.trace("Waiting for running command to complete"); log.trace("Waiting for running command to complete");
SystemClock.sleep(500); SystemClock.sleep(500);
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
if (now > timeout) { if (now > dynamicTimeout) {
log.error("Running command " + activeCmd + " timed out"); boolean menuRecentlyUpdated = now < menuLastUpdated + 5 * 1000;
cmdThread.interrupt(); boolean inMenuNotMainMenu = currentMenu != null && currentMenu.getType() != MenuType.MAIN_MENU;
SystemClock.sleep(5000); if (menuRecentlyUpdated || inMenuNotMainMenu) {
log.error("Timed out thread dead yet? " + cmdThread.isAlive()); // command still working (or waiting for pump to complete, e.g. bolus delivery)
return new CommandResult().success(false).enacted(false).message("Command timed out"); dynamicTimeout = now + 30 * 1000;
} else {
log.error("Dynamic timeout running command " + activeCmd);
cmdThread.interrupt();
SystemClock.sleep(5000);
log.error("Timed out thread dead yet? " + cmdThread.isAlive());
return new CommandResult().success(false).enacted(false).message("Command stalled, check pump!");
}
}
if (now > overallTimeout) {
String msg = "Command " + cmd + " timed out after 4 min, check pump!";
log.error(msg);
return new CommandResult().success(false).enacted(false).message(msg);
} }
// TODO this is an extra safety measure when the user interrupts a command by using the pump
// and the pump returns before the timeout, the command might continue to try, but will
// very likely safely fail, still ....
// TODO if ruffyscripter ensures the meun is ready for a command: then
// operations of a command should all timeout after 5-10 seconds, right?
// anything else can't be right. and the pump quits menus after what, 8 seconds? alright, twenty
// if (currentMenu != null && now > menuLastUpdated + 5 * 1000) {
// log.debug("Stopped receiving menu updates while running command, aborting the command");
// cmdThread.interrupt();
// SystemClock.sleep(5000);
// log.error("Thread not receiving menu updates dead yet? " + cmdThread.isAlive());
// return new CommandResult().success(false).enacted(false).message("Pump stopped sending state updates");
// }
} }
if (returnable.cmdResult.state == null) { if (returnable.cmdResult.state == null) {