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

Persistent TM Store #320

Merged
muellerr merged 109 commits from mueller/pus-15-tm-storage into develop 2023-02-24 19:03:39 +01:00
Conversation 0 Commits 109 Files Changed 62 +19 -12
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 58d6b59b7c - Show all commits

3
mission/tmtc/PusTmFunnel.cpp
View File

@ -12,7 +12,8 @@ PusTmFunnel::PusTmFunnel(object_id_t objectId, TimeReaderIF &timeReader, Storage
timeReader(timeReader), timeReader(timeReader),
miscStore(objects::MISC_STORE, "tm", "misc", RolloverInterval::HOURLY, 8, currentTv, sdcMan), miscStore(objects::MISC_STORE, "tm", "misc", RolloverInterval::HOURLY, 8, currentTv, sdcMan),
okStore(objects::OK_STORE, "tm", "ok", RolloverInterval::MINUTELY, 30, currentTv, sdcMan), okStore(objects::OK_STORE, "tm", "ok", RolloverInterval::MINUTELY, 30, currentTv, sdcMan),
notOkStore(objects::NOT_OK_STORE,"tm", "nok", RolloverInterval::MINUTELY, 30, currentTv, sdcMan), notOkStore(objects::NOT_OK_STORE, "tm", "nok", RolloverInterval::MINUTELY, 30, currentTv,
sdcMan),
sdcMan(sdcMan) { sdcMan(sdcMan) {
Clock::getClock_timeval(&currentTv); Clock::getClock_timeval(&currentTv);
Clock::getUptime(&lastTvUpdate); Clock::getUptime(&lastTvUpdate);

23
mission/tmtc/TmStore.cpp
View File

@ -11,8 +11,13 @@
using namespace returnvalue; using namespace returnvalue;
TmStore::TmStore(object_id_t objectId, const char* baseDir, std::string baseName, TmStore::TmStore(object_id_t objectId, const char* baseDir, std::string baseName,
RolloverInterval intervalUnit, uint32_t intervalCount, timeval& currentTv, SdCardMountedIF& sdcMan) RolloverInterval intervalUnit, uint32_t intervalCount, timeval& currentTv,
: SystemObject(objectId), baseDir(std::move(baseDir)), baseName(std::move(baseName)), currentTv(currentTv), sdcMan(sdcMan) { SdCardMountedIF& sdcMan)
: SystemObject(objectId),
baseDir(std::move(baseDir)),
baseName(std::move(baseName)),
currentTv(currentTv),
sdcMan(sdcMan) {
calcDiffSeconds(intervalUnit, intervalCount); calcDiffSeconds(intervalUnit, intervalCount);
} }
@ -119,10 +124,10 @@ void TmStore::assignAndOrCreateMostRecentFile() {
} }
unsigned int underscorePos = pathStr.find_last_of('_'); unsigned int underscorePos = pathStr.find_last_of('_');
std::string stampStr = pathStr.substr(underscorePos + 1); std::string stampStr = pathStr.substr(underscorePos + 1);
int count = int count = sscanf(stampStr.c_str(),
sscanf(stampStr.c_str(), "%04" SCNu32 "-%02" SCNu32 "-%02" SCNu32 "T%02" SCNu32 "-%02" SCNu32
"%4" SCNu32 "-%2" SCNu32 "-%2" SCNu32 "T%2" SCNu32 ":%2" SCNu32 ":%2" SCNu32 "Z", "-%02" SCNu32 "Z",
&tod.year, &tod.month, &tod.day, &tod.hour, &tod.minute, &tod.second); &tod.year, &tod.month, &tod.day, &tod.hour, &tod.minute, &tod.second);
if (count != 6) { if (count != 6) {
continue; continue;
} }
@ -137,12 +142,12 @@ void TmStore::assignAndOrCreateMostRecentFile() {
unsigned currentIdx = 0; unsigned currentIdx = 0;
path pathStart = basePath / baseName; path pathStart = basePath / baseName;
memcpy(fileBuf.data() + currentIdx, pathStart.c_str(), pathStart.string().length()); memcpy(fileBuf.data() + currentIdx, pathStart.c_str(), pathStart.string().length());
currentIdx += baseName.size(); currentIdx += pathStart.string().length();
Clock::TimeOfDay_t tod; Clock::TimeOfDay_t tod;
Clock::convertTimevalToTimeOfDay(&currentTv, &tod); Clock::convertTimevalToTimeOfDay(&currentTv, &tod);
currentIdx += sprintf(reinterpret_cast<char*>(fileBuf.data() + currentIdx), currentIdx += sprintf(reinterpret_cast<char*>(fileBuf.data() + currentIdx),
"_%4" PRIu32 "-%2" PRIu32 "-%2" PRIu32 "T%2" PRIu32 ":%2" PRIu32 "_%04" PRIu32 "-%02" PRIu32 "-%02" PRIu32 "T%02" PRIu32 "-%02" PRIu32
":%2" PRIu32 "Z.bin", "-%02" PRIu32 "Z.bin",
tod.year, tod.month, tod.day, tod.hour, tod.minute, tod.second); tod.year, tod.month, tod.day, tod.hour, tod.minute, tod.second);
path newPath(std::string(reinterpret_cast<const char*>(fileBuf.data()), currentIdx)); path newPath(std::string(reinterpret_cast<const char*>(fileBuf.data()), currentIdx));
std::ofstream of(newPath, std::ios::binary); std::ofstream of(newPath, std::ios::binary);

5
mission/tmtc/TmStore.h
View File

@ -19,8 +19,9 @@ enum class RolloverInterval { MINUTELY, HOURLY, DAILY };
class TmStore : public SystemObject { class TmStore : public SystemObject {
public: public:
TmStore(object_id_t objectId, const char* baseDir, std::string baseName, RolloverInterval intervalUnit, TmStore(object_id_t objectId, const char* baseDir, std::string baseName,
uint32_t intervalCount, timeval& currentTv, SdCardMountedIF& sdcMan); RolloverInterval intervalUnit, uint32_t intervalCount, timeval& currentTv,
SdCardMountedIF& sdcMan);
void addApid(uint16_t apid); void addApid(uint16_t apid);
void addService(uint8_t service); void addService(uint8_t service);