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

Reenable multithreading, and add LoadSummary multithreading

Browse Source
This commit is contained in:
Mark Watkins 2018-04-23 04:12:36 +10:00
parent f940064482
commit 777c3aa98a
6 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib PRS1 Loader Implementation /* SleepLib PRS1 Loader Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -2869,9 +2869,9 @@ void PRS1Import::run()
session->UpdateSummaries(); session->UpdateSummaries();
// Save is not threadsafe // Save is not threadsafe
loader->saveMutex.lock(); // loader->saveMutex.lock();
session->Store(mach->getDataPath()); session->Store(mach->getDataPath());
loader->saveMutex.unlock(); // loader->saveMutex.unlock();
// Unload them from memory // Unload them from memory
session->TrashEvents(); session->TrashEvents();

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

@ -1,4 +1,4 @@
/* SleepLib ResMed Loader Implementation /* SleepLib ResMed Loader Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -1071,10 +1071,10 @@ void ResmedImport::run()
// Update indexes, process waveform and perform flagging // Update indexes, process waveform and perform flagging
sess->UpdateSummaries(); sess->UpdateSummaries();
// Save is not threadsafe // Save is not threadsafe?
loader->saveMutex.lock(); // loader->saveMutex.lock();
sess->Store(mach->getDataPath()); sess->Store(mach->getDataPath());
loader->saveMutex.unlock(); // loader->saveMutex.unlock();
// Free the memory used by this session // Free the memory used by this session
sess->TrashEvents(); sess->TrashEvents();
@ -1235,9 +1235,9 @@ void ResmedImportStage2::run()
} }
loader->addSession(sess); loader->addSession(sess);
loader->saveMutex.lock(); //loader->saveMutex.lock();
sess->Store(mach->getDataPath()); sess->Store(mach->getDataPath());
loader->saveMutex.unlock(); //loader->saveMutex.unlock();
} }
@ -3285,8 +3285,6 @@ void ResInitModelMap()
resmed_codes[CPAP_PressureMin].push_back("Pression min."); resmed_codes[CPAP_PressureMin].push_back("Pression min.");
resmed_codes[CPAP_PressureMin].push_back("Min tryck"); resmed_codes[CPAP_PressureMin].push_back("Min tryck");
// SAD file // SAD file
resmed_codes[OXI_Pulse].push_back("Pulse.1s"); resmed_codes[OXI_Pulse].push_back("Pulse.1s");
resmed_codes[OXI_SPO2].push_back("SpO2.1s"); resmed_codes[OXI_SPO2].push_back("SpO2.1s");
@ -3309,12 +3307,6 @@ void ResInitModelMap()
resmed_codes[RMS9_SetPressure].push_back("S.C.Press"); resmed_codes[RMS9_SetPressure].push_back("S.C.Press");
resmed_codes[RMS9_EPRLevel].push_back("S.EPR.Level"); resmed_codes[RMS9_EPRLevel].push_back("S.EPR.Level");
} }
ChannelID ResmedLoader::CPAPModeChannel() { return RMS9_Mode; } ChannelID ResmedLoader::CPAPModeChannel() { return RMS9_Mode; }

45
sleepyhead/SleepLib/machine.cpp
View File

@ -794,14 +794,14 @@ void SaveThread::run()
while (running) { while (running) {
Session *sess = machine->popSaveList(); Session *sess = machine->popSaveList();
if (sess) { if (sess) {
if (machine->m_donetasks % 10 == 0) { if (machine->m_donetasks % 20 == 0) {
int i = (float(machine->m_donetasks) / float(machine->m_totaltasks) * 100.0); int i = (float(machine->m_donetasks) / float(machine->m_totaltasks) * 100.0);
emit UpdateProgress(i); emit UpdateProgress(i);
} }
sess->UpdateSummaries(); sess->UpdateSummaries();
machine->saveMutex.lock(); //machine->saveMutex.lock();
sess->Store(path); sess->Store(path);
machine->saveMutex.unlock(); //machine->saveMutex.unlock();
sess->TrashEvents(); sess->TrashEvents();
} else { } else {
@ -841,33 +841,33 @@ void SaveTask::run()
void Machine::queTask(ImportTask * task) void Machine::queTask(ImportTask * task)
{ {
// Okay... what was this turned off???
if (AppSetting->multithreading()) { if (AppSetting->multithreading()) {
m_tasklist.push_back(task); m_tasklist.push_back(task);
return; return;
} }
// Not multithreading, run it right now...
task->run(); task->run();
return; return;
} }
void Machine::runTasks() void Machine::runTasks()
{ {
if (0) { //!p_profile->session->multithreading()) { if (0) { //!AppSetting->multithreading()) {
Q_ASSERT(m_tasklist.isEmpty()); Q_ASSERT(m_tasklist.isEmpty());
return; return;
} }
QThreadPool * threadpool = QThreadPool::globalInstance(); QThreadPool * threadpool = QThreadPool::globalInstance();
int m_totaltasks=m_tasklist.size(); // int m_totaltasks=m_tasklist.size();
int m_currenttask=0; int m_currenttask=0;
while (!m_tasklist.isEmpty()) { while (!m_tasklist.isEmpty()) {
if (threadpool->tryStart(m_tasklist.at(0))) { if (threadpool->tryStart(m_tasklist.at(0))) {
m_tasklist.pop_front(); m_tasklist.pop_front();
float f = float(m_currenttask) / float(m_totaltasks) * 100.0; // float f = float(m_currenttask) / float(m_totaltasks) * 100.0;
qprogress->setValue(f); // qprogress->setValue(f);
m_currenttask++; m_currenttask++;
} }
QApplication::processEvents(); //QApplication::processEvents();
} }
QThreadPool::globalInstance()->waitForDone(-1); QThreadPool::globalInstance()->waitForDone(-1);
} }
@ -887,6 +887,23 @@ bool Machine::hasModifiedSessions()
const QString summaryFileName = "Summaries.xml"; const QString summaryFileName = "Summaries.xml";
const int summaryxml_version=1; const int summaryxml_version=1;
class LoadTask:public ImportTask
{
public:
LoadTask(Session * s, Machine * m): sess(s), mach(m) {}
virtual ~LoadTask() {}
virtual void run();
protected:
Session * sess;
Machine * mach;
};
void LoadTask::run()
{
sess->LoadSummary();
}
bool Machine::LoadSummary(QProgressBar * progress) bool Machine::LoadSummary(QProgressBar * progress)
{ {
QTime time; QTime time;
@ -997,17 +1014,21 @@ bool Machine::LoadSummary(QProgressBar * progress)
progress->setMaximum(sess_order.size()); progress->setMaximum(sess_order.size());
for (it = sess_order.begin(); it != it_end; ++it, ++cnt) { for (it = sess_order.begin(); it != it_end; ++it, ++cnt) {
if ((cnt % 100) == 0) { //
/* if ((cnt % 100) == 0) {
progress->setValue(cnt); progress->setValue(cnt);
//QApplication::processEvents(); //QApplication::processEvents();
} } */
Session * sess = it.value(); Session * sess = it.value();
if (!AddSession(sess)) { if (!AddSession(sess)) {
delete sess; delete sess;
} else { } else {
if (loadSummaries) sess->LoadSummary(); if (loadSummaries) {
queTask(new LoadTask(sess,this));
} }
} }
}
runTasks();
progress->setValue(sess_order.size()); progress->setValue(sess_order.size());
QApplication::processEvents(); QApplication::processEvents();

8
sleepyhead/SleepLib/machine_loader.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib Machine Loader Class Implementation /* SleepLib Machine Loader Class Implementation
* *
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net> * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* *
@ -171,8 +171,7 @@ void MachineLoader::queTask(ImportTask * task)
void MachineLoader::runTasks(bool threaded) void MachineLoader::runTasks(bool threaded)
{ {
//debug threaded=AppSetting->multithreading();
threaded=false;
m_totaltasks=m_tasklist.size(); m_totaltasks=m_tasklist.size();
m_currenttask=0; m_currenttask=0;
@ -188,6 +187,7 @@ void MachineLoader::runTasks(bool threaded)
} }
} else { } else {
QThreadPool * threadpool = QThreadPool::globalInstance(); QThreadPool * threadpool = QThreadPool::globalInstance();
while (!m_tasklist.isEmpty()) { while (!m_tasklist.isEmpty()) {
if (threadpool->tryStart(m_tasklist.at(0))) { if (threadpool->tryStart(m_tasklist.at(0))) {
m_tasklist.pop_front(); m_tasklist.pop_front();
@ -195,8 +195,10 @@ void MachineLoader::runTasks(bool threaded)
qprogress->setValue(f); qprogress->setValue(f);
m_currenttask++; m_currenttask++;
} }
if ((m_currenttask % 50)==0) {
QApplication::processEvents(); QApplication::processEvents();
} }
}
QThreadPool::globalInstance()->waitForDone(-1); QThreadPool::globalInstance()->waitForDone(-1);
} }
} }

4
sleepyhead/mainwindow.cpp
View File

@ -121,7 +121,7 @@ MainWindow::MainWindow(QWidget *parent) :
qprogress->setMaximum(100); qprogress->setMaximum(100);
qstatus = new QLabel("", this); qstatus = new QLabel("", this);
qprogress->hide(); qprogress->hide();
ui->statusbar->setMinimumWidth(200); //ui->statusbar->setMinimumWidth(200);
ui->statusbar->addPermanentWidget(qstatus, 0); ui->statusbar->addPermanentWidget(qstatus, 0);
ui->statusbar->addPermanentWidget(qprogress, 1); ui->statusbar->addPermanentWidget(qprogress, 1);
@ -502,7 +502,7 @@ void MainWindow::OpenProfile(QString profileName)
overview->ReloadGraphs(); overview->ReloadGraphs();
// Should really create welcome and statistics here, but they need redoing later anyway to kill off webkit // Should really create welcome and statistics here, but they need redoing later anyway to kill off webkit
ui->tabWidget->setCurrentWidget(ui->welcomeTab); ui->tabWidget->setCurrentIndex(AppSetting->openTabAtStart());
GenerateStatistics(); GenerateStatistics();
PopulatePurgeMenu(); PopulatePurgeMenu();

10
sleepyhead/mainwindow.ui
View File

@ -1454,8 +1454,8 @@ QToolBox::tab:selected {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>175</width> <width>158</width>
<height>680</height> <height>676</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -1913,7 +1913,7 @@ border: 2px solid #56789a; border-radius: 30px;
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>175</width> <width>175</width>
<height>680</height> <height>667</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -3061,7 +3061,7 @@ border-radius: 10px;
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>175</width> <width>175</width>
<height>680</height> <height>667</height>
</rect> </rect>
</property> </property>
<property name="mouseTracking"> <property name="mouseTracking">
@ -3250,7 +3250,7 @@ border-radius: 10px;
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>7</height> <height>20</height>
</size> </size>
</property> </property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">