Fixed yet another deadlock in script stopping

Author: yurii-litvinov

trikControl/src/soundSensorWorker.cpp

@@ -14,8 +14,6 @@
 
 #include "soundSensorWorker.h"
 
-#include <QtCore/QDebug>
-
 using namespace trikControl;
 
 SoundSensorWorker::SoundSensorWorker(const QString &script, const QString &inputFile, const QString &outputFile

trikGui/wiFiInitWidget.cpp

@@ -16,7 +16,6 @@
 
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QDebug>
 
 #include <QtGui/QKeyEvent>
 

trikGui/wiFiModeWidget.cpp

@@ -15,7 +15,6 @@
 #include "wiFiModeWidget.h"
 
 #include <QtGui/QKeyEvent>
-#include <QtCore/QDebug>
 
 #include <trikKernel/paths.h>
 #include <QsLog.h>

trikNetwork/src/mailbox.cpp

@@ -120,7 +120,8 @@ QString Mailbox::receive(bool wait)
 	QString result;
 
 	QEventLoop loop;
-	QObject::connect(this, SIGNAL(stopWaitingSignal()), &loop, SLOT(quit()));
+	QObject::connect(this, SIGNAL(stopWaitingSignal()), &loop, SLOT(quit()), Qt::QueuedConnection);
+
 	if (!mWorker->hasMessages() && wait) {
 		loop.exec();
 	}

trikNetwork/src/mailboxConnection.cpp

@@ -16,8 +16,6 @@
 
 #include <QtCore/QStringList>
 
-#include <QtCore/QDebug>
-
 #include <QsLog.h>
 
 using namespace trikNetwork;

trikScriptRunner/src/scriptEngineWorker.cpp

@@ -114,6 +114,7 @@ void ScriptEngineWorker::stopScript()
 		return;
 	}
 
+
 	while (mState == starting) {
 		// Some script is starting right now, so we are in inconsistent state. Let it start, then stop it.
 		QThread::yieldCurrentThread();
@@ -125,8 +126,11 @@ void ScriptEngineWorker::stopScript()
 
 	mScriptControl.reset();
 
+	if (mMailbox) {
+		mMailbox->stopWaiting();
+	}
+
 	mThreading.reset();
-	mMailbox->stopWaiting();
 
 	if (mDirectScriptsEngine) {
 		mDirectScriptsEngine->abortEvaluation();

trikScriptRunner/src/scriptExecutionControl.cpp

@@ -14,7 +14,6 @@
 
 #include "scriptExecutionControl.h"
 
-#include <QtCore/QDebug>
 #include <QtCore/QDateTime>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QProcess>

trikScriptRunner/src/scriptThread.cpp

@@ -41,14 +41,15 @@ void ScriptThread::run()
 	qsrand(QDateTime::currentMSecsSinceEpoch());
 
 	mEngine->evaluate(mScript);
+
 	if (mEngine->hasUncaughtException()) {
 		const int line = mEngine->uncaughtExceptionLineNumber();
 		const QString message = mEngine->uncaughtException().toString();
 		mError = tr("Line %1: %2").arg(QString::number(line), message);
 		QLOG_ERROR() << "Uncaught exception at line" << line << ":" << message;
 	} else if (mThreading.inEventDrivenMode()) {
 		QEventLoop loop;
-		connect(this, SIGNAL(stopRunning()), &loop, SLOT(quit()), Qt::DirectConnection);
+		connect(this, SIGNAL(stopRunning()), &loop, SLOT(quit()), Qt::QueuedConnection);
 		loop.exec();
 	}
 

trikScriptRunner/src/threading.cpp

@@ -160,17 +160,17 @@ void Threading::reset()
 	}
 
 	mMessageMutex.unlock();
-
 	mThreadsMutex.lock();
+
 	for (ScriptThread *thread : mThreads.values()) {
 		mScriptControl.reset();  // TODO: find more sophisticated solution to prevent waiting after abortion
 		thread->abort();
 	}
 
 	mFinishedThreads.clear();
 	mThreadsMutex.unlock();
-
 	mScriptControl.reset();
+
 	waitForAll();
 
 	qDeleteAll(mMessageQueueMutexes);

trikWiFi/src/trikWiFi.cpp

@@ -16,7 +16,6 @@
 
 #include <QtCore/QStringList>
 #include <QtNetwork/QNetworkInterface>
-#include <QtCore/QDebug>
 
 #include <QsLog.h>