Changeset 4904

Timestamp:

11/22/10 17:06:12 (14 years ago)

Author:

epitzer

Message:

Add operator trace view (#47)

Location:

branches/HeuristicLab.DebugEngine

Files:

• DebugEngine.cs (modified) (11 diffs)
• DebugEngineView.Designer.cs (modified) (10 diffs)
• DebugEngineView.cs (modified) (3 diffs)
• DebugEngineView.resx (modified) (2 diffs)
• ExecutionStackView.Designer.cs (modified) (1 diff)
• HeuristicLab.DebugEngine.csproj (modified) (2 diffs)
• OperationContentView.cs (modified) (2 diffs)
• OperatorTraceView.Designer.cs (added)
• OperatorTraceView.cs (added)
• OperatorTraceView.resx (added)

branches/HeuristicLab.DebugEngine/DebugEngine.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -48 +49 @@
       Log = cloner.Clone(original.Log);
       ExecutionStack = cloner.Clone(original.ExecutionStack);
+      OperatorTrace = new ItemList<IOperator>(original.OperatorTrace.Select(op => cloner.Clone(op)));
+      operatorParents = original.operatorParents.ToDictionary(kvp => cloner.Clone(kvp.Key), kvp => cloner.Clone(kvp.Value));
       pausePending = original.pausePending;
       stopPending = original.stopPending;
@@ -60 +63 @@
       Log = new Log();
       ExecutionStack = new ExecutionStack();
+      OperatorTrace = new ItemList<IOperator>();
+      operatorParents = new Dictionary<IAtomicOperation, IAtomicOperation>();
       pausePending = stopPending = false;
       timer = new System.Timers.Timer(100);
@@ -110 +115 @@
     }
 
+    [Storable]
+    public ItemList<IOperator> OperatorTrace { get; private set; }
+
+    [Storable]
+    private Dictionary<IAtomicOperation, IAtomicOperation> operatorParents;
+
     #endregion
 
@@ -131 +142 @@
       ignoreNextBreakpoint = false;
       CurrentOperation = null;
+      OperatorTrace.Clear();
+      operatorParents.Clear();
       OnPrepared();
     }
@@ -140 +153 @@
       ignoreNextBreakpoint = false;
       CurrentOperation = null;
+      OperatorTrace.Clear();
+      operatorParents.Clear();
       OnPrepared();
     }
@@ -161 +176 @@
     public override void Start() {
       base.Start();
-      CurrentOperation = null;
       ThreadPool.QueueUserWorkItem(new WaitCallback(Run), null);
     }
@@ -250 +264 @@
           ExpandOperationCollection(operations);
         } else if (ExecutionStack.Count > 0) {
-          Log.LogMessage("Poping execution stack");
+          Log.LogMessage("Popping execution stack");
           CurrentOperation = ExecutionStack.Last();
           ExecutionStack.RemoveAt(ExecutionStack.Count - 1);
@@ -256 +270 @@
           Log.LogMessage("Nothing to do");
         }
+        GenerateOperationTrace();
       } catch (Exception x) {
         OnExceptionOccurred(x);
+      }
+    }
+
+    private void GenerateOperationTrace() {
+      var operation = CurrentOperation as IAtomicOperation;
+      if (operation != null) {
+        List<IOperator> trace = new List<IOperator>();
+        while (operation != null) {
+          trace.Add(operation.Operator);
+          IAtomicOperation parent = null;
+          operatorParents.TryGetValue(operation, out parent);
+          operation = parent;
+        }
+        trace.Reverse();
+        OperatorTrace.Clear();
+        OperatorTrace.AddRange(trace);
       }
     }
@@ -276 +307 @@
           currentOperator = operation.Operator;
           IOperation successor = operation.Operator.Execute((IExecutionContext)operation);
-          CurrentOperation = null;
-          currentOperator = null;
           if (successor != null) {
+            AssignParents(operation, successor);
             ExecutionStack.Add(successor);
           }
+          currentOperator = null;
+          CurrentOperation = null;
         } catch (Exception ex) {
           OnExceptionOccurred(new OperatorExecutionException(operation.Operator, ex));
@@ -288 +320 @@
     }
 
+    private void AssignParents(IAtomicOperation parent, IOperation successor) {
+      OperationCollection operations = successor as OperationCollection;
+      if (operations != null)
+        foreach (var op in operations)
+          AssignParents(parent, op);
+      IAtomicOperation atomicOperation = successor as IAtomicOperation;
+      if (atomicOperation != null && atomicOperation.Operator != null && !operatorParents.ContainsKey(atomicOperation))
+        operatorParents[atomicOperation] = parent;
+    }
+
     protected virtual void ExpandOperationCollection(OperationCollection operations) {
       ExecutionStack.AddRange(operations.Reverse());

branches/HeuristicLab.DebugEngine/DebugEngineView.Designer.cs

@@ -49 +49 @@
       this.label1 = new System.Windows.Forms.Label();
       this.executionTimeTextBox = new System.Windows.Forms.TextBox();
-      this.executionStackView = new HeuristicLab.DebugEngine.ExecutionStackView();
-      this.operationContentView = new HeuristicLab.DebugEngine.OperationContentView();
+      this.operationContentView = new OperationContentView();
       this.logView = new HeuristicLab.Core.Views.LogView();
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
@@ -58 +57 @@
       this.refreshButton = new System.Windows.Forms.Button();
       this.skipStackOpsCheckBox = new System.Windows.Forms.CheckBox();
+      this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+      this.executionStackView = new HeuristicLab.DebugEngine.ExecutionStackView();
+      this.operatorTraceView = new OperatorTraceView();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
@@ -64 +66 @@
       this.splitContainer2.Panel2.SuspendLayout();
       this.splitContainer2.SuspendLayout();
+      this.splitContainer3.Panel1.SuspendLayout();
+      this.splitContainer3.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -85 +89 @@
       this.executionTimeTextBox.TabIndex = 1;
       // 
-      // executionStackView
-      // 
-      this.executionStackView.Caption = "Execution Stack View";
-      this.executionStackView.Content = null;
-      this.executionStackView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.executionStackView.Location = new System.Drawing.Point(0, 0);
-      this.executionStackView.Name = "executionStackView";
-      this.executionStackView.ReadOnly = false;
-      this.executionStackView.Size = new System.Drawing.Size(252, 262);
-      this.executionStackView.TabIndex = 0;
-      // 
-      // operationContentView
-      // 
-      this.operationContentView.Caption = "Operation Content View";
-      this.operationContentView.Content = null;
-      this.operationContentView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.operationContentView.Location = new System.Drawing.Point(0, 0);
-      this.operationContentView.Name = "operationContentView";
-      this.operationContentView.ReadOnly = false;
-      this.operationContentView.Size = new System.Drawing.Size(610, 503);
-      this.operationContentView.TabIndex = 0;
-      // 
       // logView
       // 
@@ -115 +97 @@
       this.logView.Name = "logView";
       this.logView.ReadOnly = false;
-      this.logView.Size = new System.Drawing.Size(252, 237);
+      this.logView.Size = new System.Drawing.Size(198, 237);
       this.logView.TabIndex = 2;
       // 
@@ -132 +114 @@
       // 
       this.splitContainer1.Panel2.Controls.Add(this.logView);
-      this.splitContainer1.Size = new System.Drawing.Size(252, 503);
-      this.splitContainer1.SplitterDistance = 262;
+      this.splitContainer1.Size = new System.Drawing.Size(198, 502);
+      this.splitContainer1.SplitterDistance = 261;
       this.splitContainer1.TabIndex = 3;
       // 
       // splitContainer2
       // 
-      this.splitContainer2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.splitContainer2.Location = new System.Drawing.Point(3, 32);
+      this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer2.Location = new System.Drawing.Point(0, 0);
       this.splitContainer2.Name = "splitContainer2";
       // 
@@ -151 +131 @@
       // 
       this.splitContainer2.Panel2.Controls.Add(this.operationContentView);
-      this.splitContainer2.Size = new System.Drawing.Size(866, 503);
-      this.splitContainer2.SplitterDistance = 252;
+      this.splitContainer2.Size = new System.Drawing.Size(683, 502);
+      this.splitContainer2.SplitterDistance = 198;
       this.splitContainer2.TabIndex = 0;
       // 
@@ -189 +169 @@
       this.skipStackOpsCheckBox.UseVisualStyleBackColor = true;
       // 
+      // splitContainer3
+      // 
+      this.splitContainer3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.splitContainer3.Location = new System.Drawing.Point(3, 33);
+      this.splitContainer3.Name = "splitContainer3";
+      // 
+      // splitContainer3.Panel1
+      // 
+      this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
+      this.splitContainer3.Panel2.Controls.Add(this.operatorTraceView);
+      this.splitContainer3.Size = new System.Drawing.Size(866, 502);
+      this.splitContainer3.SplitterDistance = 683;
+      this.splitContainer3.TabIndex = 7;
+      this.operatorTraceView.Dock = System.Windows.Forms.DockStyle.Fill;
+      // 
+      // executionStackView
+      // 
+      this.executionStackView.Caption = "Execution Stack View";
+      this.executionStackView.Content = null;
+      this.executionStackView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.executionStackView.Location = new System.Drawing.Point(0, 0);
+      this.executionStackView.Name = "executionStackView";
+      this.executionStackView.ReadOnly = false;
+      this.executionStackView.Size = new System.Drawing.Size(198, 261);
+      this.executionStackView.TabIndex = 0;
+      // 
+      // operationContentView
+      // 
+      this.operationContentView.Caption = "Operation Content View";
+      this.operationContentView.Content = null;
+      this.operationContentView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.operationContentView.Location = new System.Drawing.Point(0, 0);
+      this.operationContentView.Name = "operationContentView";
+      this.operationContentView.ReadOnly = false;
+      this.operationContentView.Size = new System.Drawing.Size(481, 502);
+      this.operationContentView.TabIndex = 0;
+      // 
       // DebugEngineView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.splitContainer3);
       this.Controls.Add(this.skipStackOpsCheckBox);
       this.Controls.Add(this.refreshButton);
-      this.Controls.Add(this.splitContainer2);
       this.Controls.Add(this.stepButton);
       this.Controls.Add(this.executionTimeTextBox);
@@ -206 +225 @@
       this.splitContainer2.Panel2.ResumeLayout(false);
       this.splitContainer2.ResumeLayout(false);
+      this.splitContainer3.Panel1.ResumeLayout(false);
+      this.splitContainer3.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -224 +245 @@
     private System.Windows.Forms.Button refreshButton;
     private System.Windows.Forms.CheckBox skipStackOpsCheckBox;
+    private System.Windows.Forms.SplitContainer splitContainer3;
+    private OperatorTraceView operatorTraceView;
 
   }

branches/HeuristicLab.DebugEngine/DebugEngineView.cs

@@ -123 +123 @@
             executionStackView.SuspendUpdate();
             logView.Content = null;
+            operatorTraceView.Content = null;
             break;
           default:
@@ -128 +129 @@
             executionStackView.ResumeUpdate();
             operationContentView.Content = new OperationContent(Content.CurrentOperation);
+            operatorTraceView.Content = Content.OperatorTrace;
             break;
         }
@@ -138 +140 @@
         Invoke(new EventHandler<OperationChangedEventArgs>(Content_CurrentOperationChanged), sender, e);
       } else {
-        if (Content.ExecutionState != ExecutionState.Started)
-          operationContentView.Content = new OperationContent(Content.CurrentOperation);
       }
     }

branches/HeuristicLab.DebugEngine/DebugEngineView.resx

@@ -122 +122 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
-        CwsBbQSEtwAAARBJREFUOE9j+P//PwM6Tuh5woxNHJsYhmaQIqABMkDMRIwhWA0onPX8f/zkt0rEGILV
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/gAA
+        Cv4B5iV4ZgAAARBJREFUOE9j+P//PwM6Tuh5woxNHJsYhmaQIqABMkDMRIwhWA0onPX8f/zkt0rEGILV
         gNyZz/4ndN/7HzfhtQYh72A1IGPK0//z9v/+H9Rw8zXQAFt8huAKg/+z9/3637n173+30sv/gQbY4zIE
         qwGRXY/+T9n263/J0r//E6b//W+TexanIVgNCGx++L917XuwZuOSL/+lo6/9N45c9t+h6Gw8ukuwGuBR
@@ -137 +137 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEQAA
-        CxEBf2RfkQAAAmFJREFUOE+dk21IU1EYx3cVVzkhaLCy+UaY0xwlZkYRmiGR7oMEUlAGfRGKvkRFVOQ0
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBAAA
+        CwQBG8oqrQAAAmFJREFUOE+dk21IU1EYx3cVVzkhaLCy+UaY0xwlZkYRmiGR7oMEUlAGfRGKvkRFVOQ0
         DddsVmtbvpQWhCFBSvaCUcRAk0gGm8SGM7JtrU1nzYFvu3P33znDRcLpSxceDvdefr/zv+d5Lidaufjg
         QKKIWwNSUo4Tz4u4RAl5xYsgJIuEcADCYlS8oQKLvvvKdam1n+PcqjUyN5ox7PyIVrMB1U9PoKxThZI7

branches/HeuristicLab.DebugEngine/ExecutionStackView.Designer.cs

@@ -65 +65 @@
     private System.Windows.Forms.TreeView treeView;
     private System.Windows.Forms.GroupBox groupBox;
+
   }
 }

branches/HeuristicLab.DebugEngine/HeuristicLab.DebugEngine.csproj

@@ -140 +140 @@
       <DependentUpon>OperationContentView.cs</DependentUpon>
     </Compile>
+    <Compile Include="OperatorTraceView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OperatorTraceView.Designer.cs">
+      <DependentUpon>OperatorTraceView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -157 +163 @@
     <EmbeddedResource Include="OperationContentView.resx">
       <DependentUpon>OperationContentView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="OperatorTraceView.resx">
+      <DependentUpon>OperatorTraceView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">

branches/HeuristicLab.DebugEngine/OperationContentView.cs

@@ -197 +197 @@
     }
 
-    #endregion
-
     private void nameTextBox_DoubleClick(object sender, EventArgs e) {
       if (Content != null && Content.IsAtomic && Content.AtomicOperation.Operator != null)
@@ -204 +202 @@
     }
 
+    #endregion
+
+
+
   }
 }