Prevent hang by moving logger to it's own threadpool

sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp

@@ -652,9 +652,14 @@ void ResmedImport::run()
             QDateTime dt = QDateTime::fromTime_t(sessionid);
             QDateTime rt = QDateTime::fromTime_t(R.maskon);
 
-            qDebug() << "Warning: Closest matching STR record for" << dt << (sess->length() / 1000L) << "is" << rt << "by" << gap << "seconds";
+            QString msg = QString("Warning: Closest matching STR record for %1 is %2 by %3 seconds").
+                    arg(dt.toString(Qt::ISODate)).
+                    arg(sess->length() / 1000.0L,0,'f',1).
+                    arg(gap);
+            qDebug() << msg;
         }
 
+
         // Claim this session
         R.sessionid = sessionid;
 
@@ -662,8 +667,7 @@ void ResmedImport::run()
         sess->settings[RMS9_MaskOnTime] = R.maskon;
 
         // Grab all the system settings
-        if (R.set_pressure >= 0)
+        if (R.set_pressure >= 0) sess->settings[CPAP_Pressure] = R.set_pressure;
-            sess->settings[CPAP_Pressure] = R.set_pressure;
         if (R.min_pressure >= 0) sess->settings[CPAP_PressureMin] = R.min_pressure;
         if (R.max_pressure >= 0) sess->settings[CPAP_PressureMax] = R.max_pressure;
         if (R.ps >= 0) sess->settings[CPAP_PS] = R.ps;
@@ -1202,7 +1206,7 @@ int ResmedLoader::Open(QString path, Profile *profile)
     for (fgit = filegroups.begin(); fgit != filegroups.end(); ++fgit) {
         queTask(new ResmedImport(this, fgit.key(), fgit.value(), m));
     }
-    runTasks();
+    runTasks(p_profile->session->multithreading());
 
     // Now look for any new summary data that can be extracted from STR.edf records
     QMap<quint32, STRRecord>::iterator it;
@@ -1238,7 +1242,6 @@ int ResmedLoader::Open(QString path, Profile *profile)
     m->setTotalTasks(m->totalTasks() + size);
     m->unlockSaveMutex();
 
-
     m->StartSaveThreads();
 
 

sleepyhead/SleepLib/machine.cpp

@@ -415,6 +415,7 @@ Session *Machine::popSaveList()
 void Machine::StartSaveThreads()
 {
     m_savelist.clear();
+    if (!p_profile->session->multithreading()) return;
 
     QString path = profile->Get(properties[STR_PROP_Path]);
 

sleepyhead/SleepLib/machine_loader.cpp

@@ -135,6 +135,10 @@ void MachineLoader::runTasks(bool threaded)
         while (!m_tasklist.isEmpty()) {
             if (threadpool->tryStart(m_tasklist.at(0))) {
                 m_tasklist.pop_front();
+                if (m_tasklist.isEmpty()) {
+                    int i=5;
+                }
+
                 float f = float(m_currenttask) / float(m_totaltasks) * 100.0;
                 qprogress->setValue(f);
                 m_currenttask++;

sleepyhead/main.cpp

@@ -51,6 +51,8 @@
 #endif
 
 MainWindow *mainwin = nullptr;
+QThreadPool * otherThreadPool = nullptr;
+
 
 QMutex mutex;
 
@@ -102,7 +104,7 @@ void MyOutputHandler(QtMsgType type, const QMessageLogContext &context, const QS
 
     if (logger && logger->isRunning()) logger->append(msg);
     else {
-        fprintf(stderr, msg.toLocal8Bit().data());
+        fprintf(stderr, "%s\n", msg.toLocal8Bit().data());
     }
 
     if (type == QtFatalMsg) {
@@ -180,8 +182,8 @@ int main(int argc, char *argv[])
     }
 
     logger = new LogThread();
-    QThreadPool * threadpool = QThreadPool::globalInstance();
+    otherThreadPool = new QThreadPool();
-    bool b = threadpool->tryStart(logger);
+    bool b = otherThreadPool->tryStart(logger);
     if (b) {
         qWarning() << "Started logging thread";
     } else {

sleepyhead/mainwindow.cpp

@@ -147,7 +147,6 @@ void LogThread::run()
         while (!buffer.isEmpty()) {
             QString msg = buffer.takeFirst();
             emit outputLog(msg);
-            fprintf(stderr, "%s\n", msg.toLocal8Bit().constData());
         }
         strlock.unlock();
         QThread::msleep(1000);
@@ -157,6 +156,7 @@ void LogThread::run()
 void MainWindow::logMessage(QString msg)
 {
     ui->logText->appendPlainText(msg);
+    fprintf(stderr, "%s\n", msg.toLocal8Bit().constData());
 }
 
 MainWindow::MainWindow(QWidget *parent) :
@@ -382,7 +382,8 @@ MainWindow::~MainWindow()
     logger->quit();
     disconnect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString)));
 
-    QThreadPool::globalInstance()->waitForDone(-1);
+    otherThreadPool->waitForDone(-1);
+    delete logger;
     logger = nullptr;
 
     mainwin = nullptr;

sleepyhead/mainwindow.h

@@ -18,7 +18,7 @@
 #include <QNetworkReply>
 #include <QSystemTrayIcon>
 #include <QRunnable>
-#include <QPlainTextEdit>
+#include <QThreadPool>
 
 #include "version.h"
 #include "daily.h"
@@ -62,6 +62,8 @@ class MainWindow;
 // * \section install_sec Installation
 
 extern QStatusBar *qstatusbar;
+extern QThreadPool * otherThreadPool;
+
 
 class Daily;
 class Report;
@@ -82,6 +84,7 @@ public:
 
     QStringList buffer;
     QMutex strlock;
+    QThreadPool *threadpool;
 signals:
     void outputLog(QString);
 protected: