Merge master containing testing changes

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() { }
@@ -285,6 +286,16 @@ long event_cnt = 0;
 bool parseIdentTGT( QString path, MachineInfo * info, QHash<QString, QString> & idmap );    // forward
 void BackupSTRfiles( const QString strpath, const QString path, const QString strBackupPath,
                         MachineInfo & info, QMap<QDate, STRFile> & STRmap );                    // forward
+
+int ResmedLoader::Open(const QString & dirpath, ResDaySaveCallback s)                       // alternate for unit testing
+{
+    ResDaySaveCallback origCallback = saveCallback;
+    saveCallback = s;
+    int value = Open(dirpath);
+    saveCallback = origCallback;
+    return value;
+}
+
 int ResmedLoader::Open(const QString & dirpath)
 {
     QString datalogPath;
@@ -647,7 +658,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);
 }
@@ -1926,12 +1937,14 @@ void ResDayTask::run()
                 sess->setSummaryOnly(true);
                 sess->SetChanged(true);
 
-                loader->sessionMutex.lock();
+//                loader->sessionMutex.lock();          // This chunk moved into SaveSession below
-                sess->Store(mach->getDataPath());
+//                sess->Store(mach->getDataPath());
-                mach->AddSession(sess);
+//                mach->AddSession(sess);
-                loader->sessionCount++;
+//                loader->sessionCount++;
-                loader->sessionMutex.unlock();
+//                loader->sessionMutex.unlock();
-//              delete sess;
+////              delete sess;
+
+                save(loader, sess);                     // This is aliased to SaveSession - unless testing
             }
         }
         return;
@@ -2189,11 +2202,7 @@ void ResDayTask::run()
        // loader->saveMutex.lock();
        // loader->saveMutex.unlock();
 
-        loader->sessionMutex.lock();
+        save(loader, sess);
-        sess->Store(mach->getDataPath());
-        mach->AddSession(sess);  // AddSession definitely ain't threadsafe.
-        loader->sessionCount++;
-        loader->sessionMutex.unlock();
 
         // Free the memory used by this session
         sess->TrashEvents();
@@ -2201,6 +2210,17 @@ void ResDayTask::run()
     }   // 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)
 {

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 <mark@jedimark.net>
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -37,10 +38,12 @@ public:
     QHash<QString, QString> 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

oscar/tests/resmedtests.cpp

@@ -1,22 +1,24 @@
 /* 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)
 {
     p_profile = new Profile(TESTDATA_PATH "profile/", false);
+    p_profile->session->setBackupCardData(false);
 
     p_pref = new Preferences("Preferences");
     p_pref->Open();
@@ -38,18 +40,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
+    // TODO: Refactor Resmed so that passing callbacks and using static globals isn't
-    // leak sanitizers against the ResMed loader.
+    // necessary for testing. Both are used for now in order to introduce the minimal
-    //
+    // set of changes into the Resmed loader needed for testing.
-    // Once the ResMed loader is refactored support importing without writing
+    s_currentPath = path;
-    // to the database, this can be updated to pass the imported Session objects
+    s_loader->Open(path, emitSessionYaml);
-    // to SessionToYaml like the PRS1 tests do.
-    s_loader->Open(path);
 }
 
 void ResmedTests::testSessionsToYaml()
@@ -60,6 +68,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);

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);