Changeset 953 for XmlTools2/trunk

Timestamp:

Feb 10, 2014, 3:28:14 PM (11 years ago)

Author:

s10k

Message:

XmlTools
What if we increase the performance of javascript by 2.5 times or more? (trying multithreading)

Location:

XmlTools2/trunk

Files:

• XmlTools.pro (modified) (1 diff)
• optionsparser.h (modified) (1 diff)
• xmlpatch.cpp (modified) (4 diffs)
• xmlpatch.h (modified) (1 diff)

XmlTools2/trunk/XmlTools.pro

@@ -6 +6 @@
 #QT += qml #for use new google v8 qtscript engine
 QT += script #for use old qtscript engine
-#QMAKE_CXXFLAGS+= -fopenmp
-#QMAKE_LFLAGS +=  -fopenmp #OpenMP (multithreading) support
+QMAKE_CXXFLAGS+= -fopenmp
+QMAKE_LFLAGS +=  -fopenmp #OpenMP (multithreading) support
+
 
 macx {

XmlTools2/trunk/optionsparser.h

@@ -1 +1 @@
 #ifndef OPTIONSPARSER_H
 #define OPTIONSPARSER_H
-
-//#include <omp.h> // OpenMP support
 
 #include "xmlpatch.h"

XmlTools2/trunk/xmlpatch.cpp

@@ -199 +199 @@
 
     std::cout << "@COMMAND patch operation output:\n"
-    << "########################################################################"
-    << std::endl;
+              << "########################################################################"
+              << std::endl;
 
     OptionsParser myParser(Util::QStringToArgsArray(commandString));
@@ -206 +206 @@
 
     std::cout
-    << "########################################################################"
-    << std::endl;
+            << "########################################################################"
+            << std::endl;
 
     UtilXmlTools::displaySuccessMessage(1,"@COMMAND");
@@ -221 +221 @@
 void XmlPatch::executeCustomCommandOperation(const QString &jsString, const QString &filesWildcard){
 
-    QStringList filesToProcess;
-#ifdef _USE_OLD_JS_ENGINE
-    QScriptEngine engine;
-    QScriptValue engineResult; // variable to check for js_errors
-#else
-    QJSEngine engine;
-    QJSValue engineResult; // variable to check for js_errors
-#endif
-
-    QString rexmlString, jsxmlString, currXmlFileString;
-
+    QString rexmlString, jsxmlString;
+    QStringList filesToProcess=UtilXmlTools::getAllXmlFilesByWildcard(filesWildcard);
+
+    if(filesToProcess.isEmpty()){
+        UtilXmlTools::displayErrorMessage("@CUSTOM_CODE","No XML files were found for the wildcard: "+filesWildcard);
+    }
 
     QFile rexmlfile(":/resources/libs/rexml.js");
     QFile jsxmlfile(":/resources/libs/jsxml.js");
 
-    // Add echo function so user can debug the code
-    QScriptValue echoFunction = engine.newFunction(echo);
-    engine.globalObject().setProperty("echo", echoFunction);
-
-    filesToProcess=UtilXmlTools::getAllXmlFilesByWildcard(filesWildcard);
-
-    if(filesToProcess.isEmpty()){
-        UtilXmlTools::displayErrorMessage("@CUSTOM_CODE","No XML files were found for the wildcard: "+filesWildcard);
-    }
-
     rexmlfile.open(QFile::ReadOnly | QFile::Text);
     jsxmlfile.open(QFile::ReadOnly | QFile::Text);
@@ -252 +237 @@
     jsxmlString=QTextStream(&jsxmlfile).readAll();
 
-    engine.evaluate(rexmlString); // load js libraries
-    engine.evaluate(jsxmlString);
-
     // Process all XmlFiles
+#pragma omp parallel for
     for(int i=0; i<filesToProcess.size(); i++){
+
+        QString currXmlFileString;
+
+#ifdef _USE_OLD_JS_ENGINE
+        QScriptEngine engine;
+        QScriptValue engineResult; // variable to check for js_errors
+#else
+        QJSEngine engine;
+        QJSValue engineResult; // variable to check for js_errors
+#endif
+
+        // Add echo function so user can debug the code
+        QScriptValue echoFunction = engine.newFunction(echo);
+        engine.globalObject().setProperty("echo", echoFunction);
+
+        engine.evaluate(rexmlString); // load js libraries
+        engine.evaluate(jsxmlString);
 
         if(this->backupsEnabled){

XmlTools2/trunk/xmlpatch.h

@@ -4 +4 @@
 #include "xmltools.h"
 #include "optionsparser.h"
+#include <omp.h> // OpenMP support
 
 class XmlPatch