Changeset 1112

Timestamp:

Sep 8, 2019, 3:21:41 PM (5 years ago)

Author:

s10k

Message:

Fix a deadlock, v2.0f

Location:

s10k/XmlTools

Files:

• utilglobalvars.h (modified) (1 diff)
• xmlcustomcode.cpp (modified) (6 diffs)
• xmlcustomcode.h (modified) (2 diffs)

s10k/XmlTools/utilglobalvars.h

@@ -24 +24 @@
 
 static const QString AppName = "XmlTools";
-static const QString AppVersion = "2.0e";
+static const QString AppVersion = "2.0f";
 #ifdef Q_OS_WIN
 static const QString AppExecutable=AppName+".exe";

s10k/XmlTools/xmlcustomcode.cpp

@@ -37 +37 @@
         e.getXmlDataFunction = new QScriptValue(e.scriptEngine->evaluate("(function getXmlData() { return $xmlData; })"));
         e.setXmlDataFunction = new QScriptValue(e.scriptEngine->evaluate("(function setXmlData(newXmlData) { $xmlData=newXmlData; })"));
-        e.isAvailable = true;
+        e.mutexForEngine = new QMutex;
 
         // Add echo function so user can debug the code
@@ -75 +75 @@
     if(filesToProcess.size()<=CUSTOM_FILES_PER_THREAD || numThreads == 1){
 
-        jsCustomCodeEngine &jsEngine = getAvailableJsEngine();
+        jsCustomCodeEngine &jsEngine = this->jsScriptEngines.first();
 
         // Process all XmlFiles
@@ -88 +88 @@
         QVector<QFuture<void>> executingThreads;
 
-        for(int i=0; i<=filesToProcess.size()-CUSTOM_FILES_PER_THREAD; i+=CUSTOM_FILES_PER_THREAD){
+        for(int i=0, iteration = 0; i<=filesToProcess.size()-CUSTOM_FILES_PER_THREAD; i+=CUSTOM_FILES_PER_THREAD, ++iteration){
 
-            executingThreads <<
-            QtConcurrent::run(&this->myThreadPool, [=]()
+            executingThreads << QtConcurrent::run(&this->myThreadPool, [=]()
             {
-                mutexIsAvailable.lock();
-                jsCustomCodeEngine &jsEngine = getAvailableJsEngine();
-                jsEngine.isAvailable = false;
-                mutexIsAvailable.unlock();
+
+                const int indexJsEngine = iteration % this->numThreads;
+
+                jsCustomCodeEngine &jsEngine = this->jsScriptEngines[indexJsEngine];
+
+                jsEngine.mutexForEngine->lock();
 
                 QString currXmlFileStringThread;
@@ -116 +117 @@
                                     *jsEngine.jsFunction,*jsEngine.getXmlDataFunction,*jsEngine.setXmlDataFunction,backupsEnabled,verboseEnabled);
 
-                mutexIsAvailable.lock();
-                jsEngine.isAvailable = true;
-                mutexIsAvailable.unlock();
+                jsEngine.mutexForEngine->unlock();
             });
         }
@@ -131 +130 @@
             int alreadyProcessedFiles=(filesToProcess.size()/CUSTOM_FILES_PER_THREAD)*CUSTOM_FILES_PER_THREAD;
 
-            jsCustomCodeEngine &jsEngine = getAvailableJsEngine();
+            jsCustomCodeEngine &jsEngine = this->jsScriptEngines.first();
 
             for(int i=alreadyProcessedFiles; i<filesToProcess.size(); i++){
@@ -147 +146 @@
     }
 }
-
-XmlCustomCode::jsCustomCodeEngine& XmlCustomCode::getAvailableJsEngine(){
-    for(jsCustomCodeEngine &e : this->jsScriptEngines){
-        if(e.isAvailable){
-            return e;
-        }
-    }
-
-    throw std::runtime_error("Could't find an available js engine for custom command.");
-}

s10k/XmlTools/xmlcustomcode.h

@@ -27 +27 @@
     const int numThreads;
     QThreadPool myThreadPool;
-    QMutex mutexIsAvailable;
 
     struct jsCustomCodeEngine{
+        /* No need to delete these... They will stay alive until program quits. */
         QScriptEngine* scriptEngine;
         QScriptValue* jsFunction;
         QScriptValue* getXmlDataFunction;
         QScriptValue* setXmlDataFunction;
-        bool isAvailable;
+        QMutex *mutexForEngine;
     };
 
@@ -44 +44 @@
 
     void displayJsException(QScriptEngine &engine, QScriptValue &engineResult);
-    jsCustomCodeEngine& getAvailableJsEngine();
 
     __attribute__((always_inline)) inline void customCodeUnwinding(const QString &fileName, QString &currXmlFileString,
-    QScriptEngine &engine, clock_t &begin, double elapsed_secs, QScriptValue &engineResult, QScriptValue &jsFunction,
-    QScriptValue &getXmlDataFunction, QScriptValue &setXmlDataFunction, const bool &backupsEnabled, const bool &verboseEnabled){
+                                                                   QScriptEngine &engine, clock_t &begin, double elapsed_secs, QScriptValue &engineResult, QScriptValue &jsFunction,
+                                                                   QScriptValue &getXmlDataFunction, QScriptValue &setXmlDataFunction, const bool &backupsEnabled, const bool &verboseEnabled){
         if(backupsEnabled){
             UtilXmlTools::backupFile(fileName, verboseEnabled);