chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix resmed importer crash due to Session::Store not being threadsafe

Browse Source
This commit is contained in:
Mark Watkins 2018-05-31 08:53:30 +10:00
parent 5269abd3ef
commit a3b5026fd7
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -1547,9 +1547,9 @@ struct OverlappingEDF {
void ResDayTask::run() void ResDayTask::run()
{ {
// if (this->resday->date == QDate(2016,1,20)) { if (this->resday->date == QDate(2016,1,6)) {
// qDebug() << "in resday" << this->resday->date; qDebug() << "in resday" << this->resday->date;
// } }
/*loader->sessionMutex.lock(); /*loader->sessionMutex.lock();
Day *day = p_profile->FindDay(resday->date, MT_CPAP); Day *day = p_profile->FindDay(resday->date, MT_CPAP);
if (day) { if (day) {
@ -1597,9 +1597,9 @@ void ResDayTask::run()
sess->setSummaryOnly(true); sess->setSummaryOnly(true);
sess->SetChanged(true); sess->SetChanged(true);
sess->Store(mach->getDataPath());
loader->sessionMutex.lock(); loader->sessionMutex.lock();
sess->Store(mach->getDataPath());
mach->AddSession(sess); mach->AddSession(sess);
loader->sessionCount++; loader->sessionCount++;
loader->sessionMutex.unlock(); loader->sessionMutex.unlock();
@ -1788,15 +1788,15 @@ void ResDayTask::run()
// No corresponding STR.edf record, but we have EDF files // No corresponding STR.edf record, but we have EDF files
bool foundprev = false; bool foundprev = false;
// This is yuck.. we need to find the LAST date with valid settings data loader->sessionMutex.lock();
QDate first = p_profile->FirstDay(MT_CPAP);
if (first.isValid())for (QDate d = resday->date.addDays(-1); d >= first; d = d.addDays(-1)) { auto it=p_profile->daylist.find(resday->date); // should exist already to be here
loader->sessionMutex.lock(); auto begin = p_profile->daylist.begin();
Day * day = p_profile->GetDay(d, MT_CPAP); while (it!=begin) {
bool hasmachine = day && day->hasMachine(mach); --it;
loader->sessionMutex.unlock(); Day * day = it.value();
bool hasmachine = day && day->hasMachine(mach);
if (!day) continue;
if (!hasmachine) continue; if (!hasmachine) continue;
QList<Session *> sessions = day->getSessions(MT_CPAP); QList<Session *> sessions = day->getSessions(MT_CPAP);
@ -1809,6 +1809,7 @@ void ResDayTask::run()
} }
} }
loader->sessionMutex.unlock();
sess->setNoSettings(true); sess->setNoSettings(true);
if (!foundprev) { if (!foundprev) {
@ -1823,10 +1824,10 @@ void ResDayTask::run()
// Save is not threadsafe? (meh... it seems to be) // Save is not threadsafe? (meh... it seems to be)
// loader->saveMutex.lock(); // loader->saveMutex.lock();
sess->Store(mach->getDataPath());
// loader->saveMutex.unlock(); // loader->saveMutex.unlock();
loader->sessionMutex.lock(); loader->sessionMutex.lock();
sess->Store(mach->getDataPath());
mach->AddSession(sess); // AddSession definitely ain't threadsafe. mach->AddSession(sess); // AddSession definitely ain't threadsafe.
loader->sessionCount++; loader->sessionCount++;
loader->sessionMutex.unlock(); loader->sessionMutex.unlock();