From ddf2464c0cdc375fbeaaa702d8898b365f3fbad3 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 9 Sep 2011 04:38:07 +1000 Subject: [PATCH] Multithreaded import (save) feature.. View Menu option turns it on/off --- Graphs/gBarChart.cpp | 75 +++++++++++++++++++++- Graphs/gBarChart.h | 7 +++ Graphs/gGraphView.cpp | 1 + SleepLib/day.cpp | 2 +- SleepLib/loader_plugins/prs1_loader.cpp | 8 +-- SleepLib/machine.cpp | 84 +++++++++++++++++++++++-- SleepLib/machine.h | 21 +++++++ SleepLib/session.cpp | 6 +- daily.h | 4 +- mainwindow.cpp | 2 +- overview.cpp | 44 ++++++++++--- overview.h | 4 +- preferencesdialog.ui | 6 +- 13 files changed, 232 insertions(+), 32 deletions(-) diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp index 68865b12..a0066a9f 100644 --- a/Graphs/gBarChart.cpp +++ b/Graphs/gBarChart.cpp @@ -346,8 +346,79 @@ void AHIChart::SetDay(Day * day) if (total>m_maxy) m_maxy=total; } } - //m_maxy=ceil(m_maxy); - //m_miny=floor(m_miny); + m_miny=0; + + // m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; + m_maxx=qint64(QDateTime(m_profile->LastDay().addDays(1),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; + + m_empty=m_values.size()==0; +} + + + + +AvgChart::AvgChart(Profile *profile) + :gBarChart() +{ + m_label="Avg"; + m_profile=profile; +} + +void AvgChart::SetDay(Day * day) +{ + if (!m_profile) { + qWarning() << "Forgot to set profile for gBarChart dummy!"; + m_day=NULL; + return; + } + Layer::SetDay(day); + + m_values.clear(); + m_miny=9999999; + m_maxy=-9999999; + m_minx=0; + m_maxx=0; + + int dn; + EventDataType tmp,total; + ChannelID code; + + m_fday=0; + qint64 tt; + + for (QMap >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) { + tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t(); + //tt=QDateTime(d.key(),QTime(12,0,0)).toTime_t(); + dn=tt/86400; + tt*=1000L; + if (!m_minx || ttm_maxx) m_maxx=tt; + + + total=0; + bool fnd=false; + for (int j=0;jchannelExists(code)) { // too many lookups happening here.. stop the crap.. + tmp=day->wavg(code); + if (tmp>0) { + fnd=true; + total+=tmp; + m_values[dn][j+1]=tmp; + break; + } + } + } + } + if (fnd) { + if (!m_fday) m_fday=dn; + m_values[dn][0]=total; + if (totalm_maxy) m_maxy=total; + } + } m_miny=0; // m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; diff --git a/Graphs/gBarChart.h b/Graphs/gBarChart.h index b42656a8..58fdbf2c 100644 --- a/Graphs/gBarChart.h +++ b/Graphs/gBarChart.h @@ -61,4 +61,11 @@ public: virtual void SetDay(Day * day); }; +class AvgChart:public gBarChart +{ +public: + AvgChart(Profile *profile); + virtual void SetDay(Day * day); +}; + #endif // GBARCHART_H diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 95ae3c56..cbedd806 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -1888,6 +1888,7 @@ void gGraphView::setDay(Day * day) for (int i=0;isetDay(day); } + ResetBounds(); } void gGraphView::TimedRefresh() { diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index fcd0170f..8c92de61 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -186,7 +186,7 @@ EventDataType Day::wavg(ChannelID code) qint64 d; for (QVector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); - if (sess.eventlist.contains(code)) { + if (sess.m_wavg.contains(code)) { d=sess.last(code)-sess.first(code); s0=double(d)/1000.0; if (s0>0) { diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index c7247e85..24376e75 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -320,7 +320,7 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) CPAP_Obstructive, CPAP_Hypopnea, CPAP_ClearAirway, CPAP_RERA, CPAP_FlowLimit, CPAP_VSnore, CPAP_CSR, PRS1_VSnore2 }; - for (unsigned i=0;icount(e[i]); sess->max(e[i]); sess->min(e[i]); @@ -328,7 +328,7 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) sess->p90(e[i]); sess->cph(e[i]); sess->sph(e[i]); - } + }*/ sess->setCph(CPAP_AHI,sess->cph(CPAP_Obstructive)+sess->cph(CPAP_Hypopnea)+sess->cph(CPAP_ClearAirway)); sess->setSph(CPAP_AHI,sess->sph(CPAP_Obstructive)+sess->sph(CPAP_Hypopnea)+sess->sph(CPAP_ClearAirway)); @@ -340,11 +340,11 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) }; for (unsigned i=0;ieventlist.contains(a[i])) { - sess->min(a[i]); + /*sess->min(a[i]); sess->max(a[i]); sess->avg(a[i]); sess->wavg(a[i]); - sess->p90(a[i]); + sess->p90(a[i]); */ sess->cph(a[i]); } } diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index a8f8dc26..0eddc33a 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -571,16 +571,92 @@ bool Machine::Save() QHash::iterator s; + m_savelist.clear(); for (s=sessionlist.begin(); s!=sessionlist.end(); s++) { cnt++; - if (qprogress) qprogress->setValue(66.0+(float(cnt)/float(size)*33.0)); - if ((*s)->IsChanged()) (*s)->Store(path); - (*s)->TrashEvents(); - QApplication::processEvents(); + if ((*s)->IsChanged()) { + m_savelist.push_back(*s); + //(*s)->UpdateSummaries(); + //(*s)->Store(path); + //(*s)->TrashEvents(); + } } + savelistCnt=0; + savelistSize=m_savelist.size(); + if (!pref["EnableMultithreading"].toBool()) { + for (int i=0;isetValue(66.0+(float(savelistCnt)/float(savelistSize)*33.0)); + QApplication::processEvents(); + Session *s=m_savelist.at(i); + s->UpdateSummaries(); + s->Store(path); + s->TrashEvents(); + savelistCnt++; + + } + return true; + } + int threads=QThread::idealThreadCount(); + savelistSem=new QSemaphore(threads); + savelistSem->acquire(threads); + QVectorthread; + for (int i=0;istart(); + } + while (!savelistSem->tryAcquire(threads,250)) { + //qDebug() << savelistSem->available(); + if (qprogress) { + // qprogress->setValue(66.0+(float(savelistCnt)/float(savelistSize)*33.0)); + QApplication::processEvents(); + } + } + + for (int i=0;iisRunning()) { + usleep(250); + QApplication::processEvents(); + } + delete thread[i]; + } + + delete savelistSem; return true; } +/*SaveThread::SaveThread(Machine *m,QString p) +{ + machine=m; + path=p; +} */ + +void SaveThread::run() +{ + while (Session *sess=machine->popSaveList()) { + int i=66.0+(float(machine->savelistCnt)/float(machine->savelistSize)*33.0); + emit UpdateProgress(i); + sess->UpdateSummaries(); + sess->Store(path); + sess->TrashEvents(); + } + machine->savelistSem->release(1); +} + +Session *Machine::popSaveList() +{ + + Session *sess=NULL; + savelistMutex.lock(); + if (m_savelist.size()>0) { + sess=m_savelist.at(0); + m_savelist.pop_front(); + savelistCnt++; + } + savelistMutex.unlock(); + return sess; +} + ////////////////////////////////////////////////////////////////////////////////////////// // CPAP implmementation ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/SleepLib/machine.h b/SleepLib/machine.h index ee3c3752..f21ff316 100644 --- a/SleepLib/machine.h +++ b/SleepLib/machine.h @@ -10,6 +10,9 @@ #include #include #include +#include +#include +#include #include #include @@ -28,6 +31,18 @@ class Session; class Profile; class Machine; +class SaveThread:public QThread +{ + Q_OBJECT +public: + SaveThread(Machine *m,QString p) { machine=m; path=p; } + virtual void run(); +protected: + Machine *machine; + QString path; +signals: + void UpdateProgress(int i); +}; class Machine { @@ -45,6 +60,12 @@ public: QHash sessionlist; QHash properties; + Session *popSaveList(); + QList m_savelist; + volatile int savelistCnt; + int savelistSize; + QMutex savelistMutex; + QSemaphore *savelistSem; Session * SessionExists(SessionID session); Day *AddSession(Session *s,Profile *p); diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index ecafb4f4..caf2e160 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -608,7 +608,7 @@ EventDataType Session::avg(ChannelID id) m_avg[id]=val; return val; } -EventDataType Session::cph(ChannelID id) +EventDataType Session::cph(ChannelID id) // count per hour { QHash::iterator i=m_cph.find(id); if (i!=m_cph.end()) @@ -620,7 +620,7 @@ EventDataType Session::cph(ChannelID id) m_cph[id]=val; return val; } -EventDataType Session::sph(ChannelID id) +EventDataType Session::sph(ChannelID id) // sum per hour { QHash::iterator i=m_sph.find(id); if (i!=m_sph.end()) @@ -632,7 +632,7 @@ EventDataType Session::sph(ChannelID id) return val; } -EventDataType Session::p90(ChannelID id) +EventDataType Session::p90(ChannelID id) // 90th Percentile { QHash::iterator i=m_90p.find(id); if (i!=m_90p.end()) diff --git a/daily.h b/daily.h index 726bffe1..48a651a4 100644 --- a/daily.h +++ b/daily.h @@ -68,9 +68,7 @@ private: gGraph *PRD,*FRW,*GAHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2, *SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB,*OF,*INTPULSE,*INTSPO2, *THPR, - *PLETHY,*TI,*TE, *RE, *IE, *BC, *UC; - - gBarChart *bc,*uc; + *PLETHY,*TI,*TE, *RE, *IE; QList OXIData; QList CPAPData; diff --git a/mainwindow.cpp b/mainwindow.cpp index 978cc7bf..7946dbb4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -397,7 +397,7 @@ void MainWindow::on_actionEnable_Multithreading_toggled(bool checked) { pref["EnableMultithreading"]=checked; if (checked) { - qDebug() << "Multithreading feature is disabled due to it currently being useless."; + //qDebug() << "Multithreading feature is disabled due to it currently being useless."; } } diff --git a/overview.cpp b/overview.cpp index 8b60892c..26071565 100644 --- a/overview.cpp +++ b/overview.cpp @@ -53,8 +53,11 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : layout->layout(); const int default_height=180; - AHI=new gGraph(GraphView,"AHI Chart",default_height,0); - UC=new gGraph(GraphView,"Usage Chart",default_height,0); + AHI=new gGraph(GraphView,"AHI",default_height,0); + UC=new gGraph(GraphView,"Usage",default_height,0); + PR=new gGraph(GraphView,"Pressure",default_height,0); + LK=new gGraph(GraphView,"Leaks",default_height,0); + uc=new UsageChart(profile); UC->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); gXAxis *gx=new gXAxis(); @@ -65,7 +68,6 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : bc=new AHIChart(profile); - //bc->setProfile(profile); bc->addSlice(CPAP_Hypopnea,QColor("blue")); bc->addSlice(CPAP_Apnea,QColor("dark green")); bc->addSlice(CPAP_Obstructive,QColor("#40c0ff")); @@ -77,6 +79,30 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : AHI->AddLayer(bc); AHI->AddLayer(new gXGrid()); + + pr=new AvgChart(profile); + pr->addSlice(CPAP_Pressure,QColor("dark green")); + //pr->addSlice(CPAP_EPAP,QColor("dark yellow")); + //pr->addSlice(CPAP_IPAP,QColor("red")); + PR->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); + gx=new gXAxis(); + gx->setUtcFix(true); + PR->AddLayer(gx,LayerBottom,0,gXAxis::Margin); + PR->AddLayer(pr); + PR->AddLayer(new gXGrid()); + + lk=new AvgChart(profile); + lk->addSlice(CPAP_Leak,QColor("gold")); + //lk->addSlice(CPAP_Leak,QColor("dark yellow")); + //pr->addSlice(CPAP_IPAP,QColor("red")); + LK->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); + gx=new gXAxis(); + gx->setUtcFix(true); + LK->AddLayer(gx,LayerBottom,0,gXAxis::Margin); + LK->AddLayer(lk); + LK->AddLayer(new gXGrid()); + + //ReloadGraphs(); } @@ -87,15 +113,13 @@ Overview::~Overview() } void Overview::ReloadGraphs() { - bc->SetDay(NULL); - AHI->MinX(); - AHI->MaxX(); - + /*bc->SetDay(NULL); uc->SetDay(NULL); - UC->MinX(); - UC->MaxX(); + pr->SetDay(NULL); + lk->SetDay(NULL); */ + GraphView->setDay(NULL); - GraphView->ResetBounds(); + // GraphView->ResetBounds(); } /* ui->setupUi(this); diff --git a/overview.h b/overview.h index a471a88b..f0399bf7 100644 --- a/overview.h +++ b/overview.h @@ -51,9 +51,11 @@ private: void UpdateHTML(); //SessionTimes *session_times; - gGraph *AHI,*UC; + gGraph *AHI,*UC,*PR,*LK; AHIChart *bc; UsageChart *uc; + AvgChart *pr; + AvgChart *lk; //,*PRESSURE,*LEAK,*SESSTIMES; //Layer *prmax,*prmin,*iap,*eap,*pr,*sesstime; diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 372ec88d..cca0d6d4 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -29,7 +29,7 @@ - 1 + 0 @@ -192,10 +192,10 @@ - Used in BMI calculations + Used in BMI calculations. Americans, please us decimal inches here, unless you speak metric. - 40.000000000000000 + 0.000000000000000 299.990000000000009