From 7701694b14780f2286b4c36c78a60db32f276a8b Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 10 Feb 2020 16:04:03 -0500 Subject: [PATCH] Add support for YAML output by Resmed loader for regression testing. --- .../SleepLib/loader_plugins/resmed_loader.cpp | 35 +++++++++++----- oscar/SleepLib/loader_plugins/resmed_loader.h | 11 ++++- oscar/tests/resmedtests.cpp | 41 +++++++++++++++---- oscar/tests/sessiontests.cpp | 9 ++++ 4 files changed, 74 insertions(+), 22 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index 1962a18a..0c7d6b1d 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -56,6 +56,7 @@ ResmedLoader::ResmedLoader() { timeInTimeDelta = timeInLoadBRP = timeInLoadPLD = timeInLoadEVE = 0; timeInLoadCSL = timeInLoadSAD = timeInEDFInfo = timeInEDFOpen = timeInAddWaveform = 0; + saveCallback = SaveSession; } ResmedLoader::~ResmedLoader() { } @@ -284,6 +285,15 @@ long event_cnt = 0; bool parseIdentTGT( QString path, MachineInfo * info, QHash & idmap ); // forward void BackupSTRfiles( const QString path, const QString strBackupPath, MachineInfo info, QMap STRmap ); // forward +int ResmedLoader::Open(const QString & dirpath, ResDaySaveCallback s) +{ + ResDaySaveCallback origCallback = saveCallback; + saveCallback = s; + int value = Open(dirpath); + saveCallback = origCallback; + return value; +} + int ResmedLoader::Open(const QString & dirpath) { QString datalogPath; @@ -636,7 +646,7 @@ void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * ma return; } - ResDayTask * rdt = new ResDayTask(this, mach, &resday); + ResDayTask * rdt = new ResDayTask(this, mach, &resday, saveCallback); rdt->reimporting = reimporting; queTask(rdt); } @@ -1869,11 +1879,7 @@ void ResDayTask::run() sess->setSummaryOnly(true); sess->SetChanged(true); - loader->sessionMutex.lock(); - sess->Store(mach->getDataPath()); - mach->AddSession(sess); - loader->sessionCount++; - loader->sessionMutex.unlock(); + save(loader, sess); } } return; @@ -2119,17 +2125,24 @@ void ResDayTask::run() // loader->saveMutex.lock(); // loader->saveMutex.unlock(); - loader->sessionMutex.lock(); - sess->Store(mach->getDataPath()); - mach->AddSession(sess); // AddSession definitely ain't threadsafe. - loader->sessionCount++; - loader->sessionMutex.unlock(); + save(loader, sess); // Free the memory used by this session sess->TrashEvents(); } // end for-loop walking the overlaps (file groups per session } +void ResmedLoader::SaveSession(ResmedLoader* loader, Session* sess) +{ + Machine* mach = sess->machine(); + + loader->sessionMutex.lock(); + sess->Store(mach->getDataPath()); + mach->AddSession(sess); // AddSession definitely ain't threadsafe. + loader->sessionCount++; + loader->sessionMutex.unlock(); +} + bool matchSignal(ChannelID ch, const QString & name); // forward bool ResmedLoader::LoadCSL(Session *sess, const QString & path) { diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.h b/oscar/SleepLib/loader_plugins/resmed_loader.h index b80c3557..85257401 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.h +++ b/oscar/SleepLib/loader_plugins/resmed_loader.h @@ -1,5 +1,6 @@ -/* SleepLib RESMED Loader Header +/* SleepLib RESMED Loader Header * + * Copyright (c) 2019-2020 The OSCAR Team * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -37,10 +38,12 @@ public: QHash files; // key is filename, value is fullpath }; +typedef void (*ResDaySaveCallback)(ResmedLoader* loader, Session* session); + class ResDayTask:public ImportTask { public: - ResDayTask(ResmedLoader * l, Machine * m, ResMedDay * d): reimporting(false), loader(l), mach(m), resday(d) {} + ResDayTask(ResmedLoader * l, Machine * m, ResMedDay * d, ResDaySaveCallback s): reimporting(false), loader(l), mach(m), resday(d), save(s) {} virtual ~ResDayTask() {} virtual void run(); @@ -50,6 +53,7 @@ protected: ResmedLoader * loader; Machine * mach; ResMedDay * resday; + ResDaySaveCallback save; }; /*! \class ResmedLoader @@ -128,6 +132,9 @@ class ResmedLoader : public CPAPLoader //////////////////////////////////////////////////////////////////////////////////////////////////////////// volatile int sessionCount; + static void SaveSession(ResmedLoader* loader, Session* session); + ResDaySaveCallback saveCallback; + int Open(const QString & dirpath, ResDaySaveCallback s); protected: //! \brief The STR.edf file is a unique edf file with many signals diff --git a/oscar/tests/resmedtests.cpp b/oscar/tests/resmedtests.cpp index 6c6eb0c1..7fe15abb 100644 --- a/oscar/tests/resmedtests.cpp +++ b/oscar/tests/resmedtests.cpp @@ -1,18 +1,19 @@ /* ResMed Unit Tests * - * Copyright (c) 2019 The OSCAR Team + * Copyright (c) 2019-2020 The OSCAR Team * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the source code * for more details. */ #include "resmedtests.h" -//#include "sessiontests.h" +#include "sessiontests.h" #define TESTDATA_PATH "./testdata/" static ResmedLoader* s_loader = nullptr; static void iterateTestCards(const QString & root, void (*action)(const QString &)); +static QString resmedOutputPath(const QString & inpath, int session, const QString & suffix); void ResmedTests::initTestCase(void) { @@ -38,18 +39,24 @@ void ResmedTests::cleanupTestCase(void) // ==================================================================================================== +static QString s_currentPath; + +static void emitSessionYaml(ResmedLoader* /*loader*/, Session* session) +{ + // Emit the parsed session data to compare against our regression benchmarks + QString outpath = resmedOutputPath(s_currentPath, session->session(), "-session.yml"); + SessionToYaml(outpath, session, true); +} static void parseAndEmitSessionYaml(const QString & path) { qDebug() << path; - // This blindly calls ResmedLoader::Open() so that we can run address and - // leak sanitizers against the ResMed loader. - // - // Once the ResMed loader is refactored support importing without writing - // to the database, this can be updated to pass the imported Session objects - // to SessionToYaml like the PRS1 tests do. - s_loader->Open(path); + // TODO: Refactor Resmed so that passing callbacks and using static globals isn't + // necessary for testing. Both are used for now in order to introduce the minimal + // set of changes into the Resmed loader needed for testing. + s_currentPath = path; + s_loader->Open(path, emitSessionYaml); } void ResmedTests::testSessionsToYaml() @@ -60,6 +67,22 @@ void ResmedTests::testSessionsToYaml() // ==================================================================================================== +QString resmedOutputPath(const QString & inpath, int session, const QString & suffix) +{ + // Output to resmed/output/FOLDER/000000(-session.yml, etc.) + QDir path(inpath); + QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), QString::SkipEmptyParts); + QString foldername = pathlist.last(); + + QDir outdir(TESTDATA_PATH "resmed/output/" + foldername); + outdir.mkpath("."); + + QString filename = QString("%1%2") + .arg(session) + .arg(suffix); + return outdir.path() + QDir::separator() + filename; +} + void iterateTestCards(const QString & root, void (*action)(const QString &)) { QDir dir(root); diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp index 19310a0a..35aa7444 100644 --- a/oscar/tests/sessiontests.cpp +++ b/oscar/tests/sessiontests.cpp @@ -148,6 +148,15 @@ static QString eventChannel(ChannelID i) CHANNELNAME(CPAP_EPAPSet); CHANNELNAME(POS_Movement); CHANNELNAME(ZEO_SleepStage); + // Resmed-specific channels + CHANNELNAME(CPAP_Apnea); + CHANNELNAME(CPAP_MaskPressure); + CHANNELNAME(CPAP_Te); + CHANNELNAME(CPAP_Ti); + CHANNELNAME(CPAP_IE); + CHANNELNAME(CPAP_FLG); + CHANNELNAME(CPAP_AHI); + CHANNELNAME(CPAP_TgMV); s = hex(i); qDebug() << "event channel" << qPrintable(s); } while(false);