eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Refactor TM handling #450

Merged
muellerr merged 47 commits from refactor_tm_handling into develop 2023-03-11 15:05:22 +01:00
Conversation 0 Commits 47 Files Changed 71 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f9c03af538 - Show all commits

12
mission/tmtc/TmStoreTaskBase.cpp
View File

@ -9,13 +9,13 @@ TmStoreTaskBase::TmStoreTaskBase(object_id_t objectId, StorageManagerIF& ipcStor
bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store, Event eventIfDone) { bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store, Event eventIfDone) {
ReturnValue_t result; ReturnValue_t result;
bool tmToStoreReceived = true; bool tmToStoreReceived = false;
bool tcRequestReceived = true; bool tcRequestReceived = false;
bool dumpsPerformed = false; bool dumpsPerformed = false;
// Store TM persistently // Store TM persistently
result = store.handleNextTm(); result = store.handleNextTm();
if (result == MessageQueueIF::EMPTY) { if (result == returnvalue::OK) {
tmToStoreReceived = false; tmToStoreReceived = true;
} }
// Dump TMs when applicable // Dump TMs when applicable
if (store.getState() == PersistentTmStore::State::DUMPING) { if (store.getState() == PersistentTmStore::State::DUMPING) {
@ -37,8 +37,8 @@ bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store, Event
} else { } else {
// Handle TC requests, for example deletion or retrieval requests. // Handle TC requests, for example deletion or retrieval requests.
result = store.handleCommandQueue(ipcStore); result = store.handleCommandQueue(ipcStore);
if (result == MessageQueueIF::EMPTY) { if (result == returnvalue::OK) {
tcRequestReceived = false; tcRequestReceived = true;
} }
} }
if (tcRequestReceived or tmToStoreReceived or dumpsPerformed) { if (tcRequestReceived or tmToStoreReceived or dumpsPerformed) {