Merge pull request 'shorter delay between file swaps' (#531) from tweaks_tm_dumps into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good

Reviewed-on: #531
This commit is contained in:
Robin Müller 2023-03-27 17:03:09 +02:00
commit be41d4f819
3 changed files with 5 additions and 15 deletions

View File

@ -33,12 +33,8 @@ ReturnValue_t PersistentLogTmStoreTask::performOperation(uint8_t opCode) {
stateHandlingForStore(handleOneStore(stores.miscStore, miscStoreContext)); stateHandlingForStore(handleOneStore(stores.miscStore, miscStoreContext));
if (not someonesBusy) { if (not someonesBusy) {
TaskFactory::delayTask(100); TaskFactory::delayTask(100);
} else /* and graceDelayDuringDumping.hasTimedOut()*/ { } else if (someFileWasSwapped) {
if (someFileWasSwapped) { TaskFactory::delayTask(10);
TaskFactory::delayTask(20);
}
// TaskFactory::delayTask(2);
// graceDelayDuringDumping.resetTimer();
} }
} }
} }

View File

@ -18,14 +18,8 @@ ReturnValue_t PersistentSingleTmStoreTask::performOperation(uint8_t opCode) {
bool busy = handleOneStore(storeWithQueue, dumpContext); bool busy = handleOneStore(storeWithQueue, dumpContext);
if (not busy) { if (not busy) {
TaskFactory::delayTask(100); TaskFactory::delayTask(100);
} else { } else if (fileHasSwapped) {
if (fileHasSwapped) { TaskFactory::delayTask(10);
TaskFactory::delayTask(20);
}
// if (fileHasSwapped and graceDelayDuringDumping.hasTimedOut()) {
// TaskFactory::delayTask(2);
// graceDelayDuringDumping.resetTimer();
// }
} }
} }
} }

2
tmtc

@ -1 +1 @@
Subproject commit 333faaa5f70646bfde1101f8e0538505574d1d7e Subproject commit 3f3523465a141bc2a2c36cbc9cbbf6ab7b3a9d70