Changeset 958 for XmlTools2/trunk

Timestamp:

Feb 15, 2014, 2:36:05 AM (11 years ago)

Author:

s10k

Message:

XmlTools
More updates.

Location:

XmlTools2/trunk

Files:

• readme.txt (modified) (2 diffs)
• util.cpp (modified) (1 diff)
• xmlpatch.cpp (modified) (3 diffs)
• xmlpatch.h (modified) (1 diff)

XmlTools2/trunk/readme.txt

@@ -1 +1 @@
 Readme.txt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-XmlTools v2.0
+XmlTools v2.0a
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -62 +62 @@
 Change Log:
 ----------------------------------
+2.0a, 15-02-2014
+-Added multithreading support for @CUSTOM_COMMAND, use wildcards in multiple files for the same js code to 
+take advantage of this (performance may increase over 2.5 times)
+-Now a warning is given if a user javascript code (@CUSTOM_COMMAND) takes too much time to finish
+-Fixed small bug when applying patches with @COMMAND + --no-verbose where some std output should not be displayed
+----------------------------------
 2.0, 08-02-2014
 -Rewrite XmlTools fom the scratch from C# to C++ in order to increase (much!) the performance of the program

XmlTools2/trunk/util.cpp

@@ -8 +8 @@
 QString AppExecutable="./"+AppName; // Mac OS needs unix like executing
 #endif
-QString AppVersion="2.0";
+QString AppVersion="2.0a";
 }
 

XmlTools2/trunk/xmlpatch.cpp

@@ -245 +245 @@
         QScriptEngine engine;
         QScriptValue engineResult; // variable to check for js_errors
+        double elapsed_secs; // elapsed seconds that a user script took
+        clock_t begin; // seconds that a script started
 
         // Add echo function so user can debug the code
@@ -269 +271 @@
         engine.globalObject().setProperty("$xmlData",currXmlFileString);
 
+        if(this->verboseEnabled){
+            begin = clock();
+        }
+
         // main needs to be called so the user code is evaluated
+        // alternatively you can do: myFunc=engine.evaluate('(function main(){})'); myFunc.call();
+        // Note the () around the function
         engineResult=engine.evaluate("main(); function main() {"+jsString+"}"); // main funtion allows to use return to exit prematurely from user code
+
+        if(this->verboseEnabled){
+            elapsed_secs = double(clock() - begin) / CLOCKS_PER_SEC;
+
+            // Warn the user if the script took much time
+            if(elapsed_secs>SLOW_SCRIPT_TIME){
+                std::cout << "Warning: Slow javascript code detected.\n" <<
+                             "Warning: Script execution seconds: " << elapsed_secs
+                          << std::endl;
+            }
+        }
 
         if (engine.hasUncaughtException()) {
@@ -433 +452 @@
             // Add --no-backups and --no-verbose if patch was called with that arguments
             if(!this->backupsEnabled){
-                command.append(" --no-backups");
+                command.append(" --no-backups ");
             }
 
             if(!this->verboseEnabled){
-                command.append(" --no-verbose");
+                command.append(" --no-verbose ");
             }
 

XmlTools2/trunk/xmlpatch.h

@@ -5 +5 @@
 #include "optionsparser.h"
 #include <omp.h> // OpenMP support
+#include <ctime> // script execution time calculation
+
+#define SLOW_SCRIPT_TIME 0.1 // if a user script takes more than 0.1 seconds to execute give a warning.
 
 class XmlPatch