Changeset 13024 for trunk/sources/HeuristicLab.Scripting

Timestamp:

10/16/15 13:31:14 (9 years ago)

Author:

jkarder

Message:

#2298: added execution time to CSharpScript

File:

• trunk/sources/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

@@ -40 +40 @@
     #region Fields & Properties
     private CSharpScriptBase compiledScript;
+    private Thread scriptThread;
+    private DateTime lastUpdateTime;
 
     public string Filename { get; set; }
@@ -47 +49 @@
     public VariableStore VariableStore {
       get { return variableStore; }
+    }
+
+    [Storable]
+    private TimeSpan executionTime;
+    public TimeSpan ExecutionTime {
+      get { return executionTime; }
+      protected set {
+        executionTime = value;
+        OnExecutionTimeChanged();
+      }
     }
     #endregion
@@ -56 +68 @@
       : base(original, cloner) {
       variableStore = cloner.Clone(original.variableStore);
+      executionTime = original.executionTime;
     }
     public CSharpScript() {
       variableStore = new VariableStore();
+      executionTime = TimeSpan.Zero;
       Code = CodeTemplate;
     }
@@ -64 +78 @@
       : base(code) {
       variableStore = new VariableStore();
+      executionTime = TimeSpan.Zero;
     }
 
@@ -94 +109 @@
     #endregion
 
-    private Thread scriptThread;
     public virtual void ExecuteAsync() {
       if (compiledScript == null) return;
+      executionTime = TimeSpan.Zero;
       scriptThread = new Thread(() => {
         Exception ex = null;
+        var timer = new System.Timers.Timer(250) { AutoReset = true };
+        timer.Elapsed += timer_Elapsed;
         try {
           OnScriptExecutionStarted();
+          lastUpdateTime = DateTime.UtcNow;
+          timer.Start();
           compiledScript.Execute(VariableStore);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
           ex = e;
-        }
-        finally {
+        } finally {
           scriptThread = null;
+          timer.Elapsed -= timer_Elapsed;
+          timer.Stop();
+          ExecutionTime += DateTime.UtcNow - lastUpdateTime;
           OnScriptExecutionFinished(ex);
         }
@@ -118 +138 @@
       if (scriptThread == null) return;
       scriptThread.Abort();
+    }
+
+    private void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) {
+      var timer = (System.Timers.Timer)sender;
+      timer.Enabled = false;
+      DateTime now = DateTime.UtcNow;
+      ExecutionTime += now - lastUpdateTime;
+      lastUpdateTime = now;
+      timer.Enabled = true;
     }
 
@@ -141 +170 @@
       if (handler != null) handler(this, new EventArgs<string>(args));
     }
+
+    public event EventHandler ExecutionTimeChanged;
+    protected virtual void OnExecutionTimeChanged() {
+      var handler = ExecutionTimeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
   }
 }