Changeset 13024 for trunk

Timestamp:

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

Author:

jkarder

Message:

#2298: added execution time to CSharpScript

Location:

trunk/sources

Files:

• HeuristicLab.Scripting.Views/3.3/CSharpScriptView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs (modified) (5 diffs)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.Designer.cs

@@ -52 +52 @@
       this.variableStoreView = new HeuristicLab.Scripting.Views.VariableStoreView();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.executionTimeTextBox = new System.Windows.Forms.TextBox();
+      this.executionTimeLabel = new System.Windows.Forms.Label();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+      this.splitContainer1.Panel1.SuspendLayout();
+      this.splitContainer1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
@@ -58 +63 @@
       this.splitContainer2.SuspendLayout();
       this.SuspendLayout();
+      // 
+      // splitContainer1.Panel1
+      // 
+      this.splitContainer1.Panel1.Controls.Add(this.executionTimeTextBox);
+      this.splitContainer1.Panel1.Controls.Add(this.executionTimeLabel);
+      this.splitContainer1.Panel1.Controls.SetChildIndex(this.executionTimeTextBox, 0);
+      this.splitContainer1.Panel1.Controls.SetChildIndex(this.executionTimeLabel, 0);
+      this.splitContainer1.Size = new System.Drawing.Size(637, 543);
       // 
       // nameTextBox
@@ -132 +145 @@
       this.viewHost.ViewType = null;
       // 
+      // executionTimeTextBox
+      // 
+      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.executionTimeTextBox.Location = new System.Drawing.Point(483, 390);
+      this.executionTimeTextBox.Name = "executionTimeTextBox";
+      this.executionTimeTextBox.ReadOnly = true;
+      this.executionTimeTextBox.Size = new System.Drawing.Size(137, 20);
+      this.executionTimeTextBox.TabIndex = 17;
+      // 
+      // executionTimeLabel
+      // 
+      this.executionTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.executionTimeLabel.AutoSize = true;
+      this.executionTimeLabel.Location = new System.Drawing.Point(394, 393);
+      this.executionTimeLabel.Name = "executionTimeLabel";
+      this.executionTimeLabel.Size = new System.Drawing.Size(83, 13);
+      this.executionTimeLabel.TabIndex = 16;
+      this.executionTimeLabel.Text = "&Execution Time:";
+      // 
       // ScriptView
       // 
@@ -144 +176 @@
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
+      this.splitContainer1.Panel1.ResumeLayout(false);
+      this.splitContainer1.Panel1.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+      this.splitContainer1.ResumeLayout(false);
       this.splitContainer2.Panel1.ResumeLayout(false);
       this.splitContainer2.Panel2.ResumeLayout(false);
@@ -159 +195 @@
     protected MainForm.WindowsForms.ViewHost viewHost;
     protected VariableStoreView variableStoreView;
+    protected TextBox executionTimeTextBox;
+    protected Label executionTimeLabel;
   }
 }

trunk/sources/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs

@@ -54 +54 @@
       Content.ScriptExecutionFinished += ContentOnScriptExecutionFinished;
       Content.ConsoleOutputChanged += ContentOnConsoleOutputChanged;
+      Content.ExecutionTimeChanged += ContentOnExecutionTimeChanged;
     }
 
@@ -60 +61 @@
       Content.ScriptExecutionFinished -= ContentOnScriptExecutionFinished;
       Content.ConsoleOutputChanged -= ContentOnConsoleOutputChanged;
+      Content.ExecutionTimeChanged -= ContentOnExecutionTimeChanged;
       base.DeregisterContentEvents();
     }
@@ -106 +108 @@
       }
     }
+    protected virtual void ContentOnExecutionTimeChanged(object sender, EventArgs eventArgs) {
+      if (InvokeRequired)
+        Invoke((Action<object, EventArgs>)ContentOnExecutionTimeChanged, sender, eventArgs);
+      else {
+        executionTimeTextBox.Text = Content == null ? "-" : Content.ExecutionTime.ToString();
+      }
+    }
     #endregion
 
@@ -112 +121 @@
       if (Content == null) {
         variableStoreView.Content = null;
+        executionTimeTextBox.Text = "-";
       } else {
         variableStoreView.Content = Content.VariableStore;
+        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
       }
     }
@@ -127 +138 @@
       } else
         if (Compile()) {
-          outputTextBox.Clear();
-          Running = true;
-          Content.ExecuteAsync();
-        }
+        outputTextBox.Clear();
+        Running = true;
+        Content.ExecuteAsync();
+      }
     }
 

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);
+    }
   }
 }