Changeset 5117

Timestamp:

12/16/10 17:57:47 (14 years ago)

Author:

epitzer

Message:

(#47)

• Disable detailed logging while not stepping for drastic reduction in log size
• Optionally disable operator trace for much faster execution and persistence (disabled by default)
• Initially enable stepping over stack operations

Location:

trunk/sources/HeuristicLab.DebugEngine/3.3

Files:

• DebugEngine.cs (modified) (4 diffs)
• DebugEngineView.Designer.cs (modified) (3 diffs)
• OperatorTrace.cs (modified) (3 diffs)
• OperatorTraceView.Designer.cs (modified) (6 diffs)
• OperatorTraceView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.DebugEngine/3.3/DebugEngine.cs

@@ -161 +161 @@
       lastUpdateTime = DateTime.Now;
       timer.Start();
-      ProcessNextOperation();
+      ProcessNextOperation(true);
       while (skipStackOperations && !(CurrentOperation is IAtomicOperation) && CanContinue)
-        ProcessNextOperation();
+        ProcessNextOperation(true);
       timer.Stop();
       ExecutionTime += DateTime.Now - lastUpdateTime;
@@ -215 +215 @@
       timer.Start();
       if (!pausePending && !stopPending && CanContinue)
-        ProcessNextOperation();
+        ProcessNextOperation(false);
       while (!pausePending && !stopPending && CanContinue && !IsAtBreakpoint)
-        ProcessNextOperation();
+        ProcessNextOperation(false);
       timer.Stop();
       ExecutionTime += DateTime.Now - lastUpdateTime;
@@ -247 +247 @@
     /// is pushed on the stack again.<br/>
     /// If the execution was successful <see cref="EngineBase.OnOperationExecuted"/> is called.</remarks>
-    protected virtual void ProcessNextOperation() {
+    protected virtual void ProcessNextOperation(bool logOperations) {
       try {
         IAtomicOperation atomicOperation = CurrentOperation as IAtomicOperation;
@@ -255 +255 @@
 
         if (atomicOperation != null) {
-          Log.LogMessage(string.Format("Performing atomic operation {0}", Utils.Name(atomicOperation)));
+          if (logOperations)
+            Log.LogMessage(string.Format("Performing atomic operation {0}", Utils.Name(atomicOperation)));
           PerformAtomicOperation(atomicOperation);
         } else if (operations != null) {
-          Log.LogMessage("Expanding operation collection");
+          if (logOperations)
+            Log.LogMessage("Expanding operation collection");
           ExecutionStack.AddRange(operations.Reverse());
           CurrentOperation = null;
         } else if (ExecutionStack.Count > 0) {
-          Log.LogMessage("Popping execution stack");
+          if (logOperations)
+            Log.LogMessage("Popping execution stack");
           CurrentOperation = ExecutionStack.Last();
           ExecutionStack.RemoveAt(ExecutionStack.Count - 1);
         } else {
-          Log.LogMessage("Nothing to do");
+          if (logOperations)
+            Log.LogMessage("Nothing to do");
         }
         OperatorTrace.Regenerate(CurrentAtomicOperation);

trunk/sources/HeuristicLab.DebugEngine/3.3/DebugEngineView.Designer.cs

@@ -77 +77 @@
       // executionStackView
       // 
-      this.executionStackView.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.executionStackView.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.executionStackView.Caption = "Execution Stack View";
       this.executionStackView.Content = null;
@@ -124 +124 @@
       this.skipStackOpsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.skipStackOpsCheckBox.AutoSize = true;
+      this.skipStackOpsCheckBox.Checked = true;
+      this.skipStackOpsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
       this.skipStackOpsCheckBox.Location = new System.Drawing.Point(63, 516);
       this.skipStackOpsCheckBox.Name = "skipStackOpsCheckBox";
@@ -146 +148 @@
       // 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.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(0, 0);
       this.splitContainer3.Name = "splitContainer3";

trunk/sources/HeuristicLab.DebugEngine/3.3/OperatorTrace.cs

@@ -36 +36 @@
     [Storable]
     protected Dictionary<IAtomicOperation, IAtomicOperation> parents;
+
+    [Storable]
+    protected bool isEnabled;
     #endregion
 
@@ -90 +93 @@
 
     public virtual void RegisterParenthood(IAtomicOperation parent, IOperation children) {
+      if (!isEnabled)
+        return;
       OperationCollection operations = children as OperationCollection;
       if (operations != null)
@@ -117 +122 @@
     }
 
+    public bool IsEnabled {
+      get { return isEnabled; }
+      set {
+        if (isEnabled == value)
+          return;
+        isEnabled = value;
+        if (!isEnabled)
+          Reset();
+      }
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.DebugEngine/3.3/OperatorTraceView.Designer.cs

@@ -50 +50 @@
       this.listViewColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
       this.imageList = new System.Windows.Forms.ImageList(this.components);
+      this.isEnabledCheckbox = new System.Windows.Forms.CheckBox();
       this.operatorTraceGroupBox.SuspendLayout();
       this.SuspendLayout();
@@ -55 +56 @@
       // operatorTraceGroupBox
       // 
+      this.operatorTraceGroupBox.Controls.Add(this.isEnabledCheckbox);
       this.operatorTraceGroupBox.Controls.Add(this.listView);
       this.operatorTraceGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -73 +75 @@
       this.listView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
       this.listView.HideSelection = false;
-      this.listView.Location = new System.Drawing.Point(6, 19);
+      this.listView.Location = new System.Drawing.Point(6, 43);
       this.listView.Name = "listView";
       this.listView.ShowItemToolTips = true;
-      this.listView.Size = new System.Drawing.Size(140, 464);
+      this.listView.Size = new System.Drawing.Size(140, 440);
       this.listView.SmallImageList = this.imageList;
       this.listView.TabIndex = 0;
@@ -89 +91 @@
       this.imageList.TransparentColor = System.Drawing.Color.Transparent;
       // 
+      // isEnabledCheckbox
+      // 
+      this.isEnabledCheckbox.AutoSize = true;
+      this.isEnabledCheckbox.Location = new System.Drawing.Point(7, 20);
+      this.isEnabledCheckbox.Name = "isEnabledCheckbox";
+      this.isEnabledCheckbox.Size = new System.Drawing.Size(65, 17);
+      this.isEnabledCheckbox.TabIndex = 1;
+      this.isEnabledCheckbox.Text = "Enabled";
+      this.isEnabledCheckbox.UseVisualStyleBackColor = true;
+      this.isEnabledCheckbox.CheckedChanged += new System.EventHandler(this.isEnabledCheckbox_CheckedChanged);
+      // 
       // OperatorTraceView
       // 
@@ -97 +110 @@
       this.Size = new System.Drawing.Size(152, 489);
       this.operatorTraceGroupBox.ResumeLayout(false);
+      this.operatorTraceGroupBox.PerformLayout();
       this.ResumeLayout(false);
 
@@ -107 +121 @@
     private System.Windows.Forms.ImageList imageList;
     private System.Windows.Forms.ColumnHeader listViewColumnHeader;
+    private System.Windows.Forms.CheckBox isEnabledCheckbox;
   }
 }

trunk/sources/HeuristicLab.DebugEngine/3.3/OperatorTraceView.cs

@@ -101 +101 @@
     }
 
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      isEnabledCheckbox.Enabled = Content != null;
+    }
+
     #region Event Handlers (child controls)
     private void listView_ItemActivate(object sender, EventArgs e) {
@@ -111 +116 @@
     }
     #endregion
+
+    private void isEnabledCheckbox_CheckedChanged(object sender, EventArgs e) {
+      Content.IsEnabled = isEnabledCheckbox.Checked;
+    }
   }