Changeset 6419 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager

Timestamp:

06/16/11 00:06:54 (13 years ago)

Author:

cneumuel

Message:

#1233

• created events when statelog changed
• fixed memory leak in hiveengine
• extended timeout for long running transactions and database contexts (when jobdata is stored)
• replaced random guids in database with sequential guids for performance reasons
• minor fixes and cleanups

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views

Files:

• RefreshableHiveExperimentView.Designer.cs (modified) (9 diffs)
• RefreshableHiveExperimentView.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.Designer.cs

@@ -21 +21 @@
 
 using HeuristicLab.Clients.Hive.Views.ExperimentManager;
+using HeuristicLab.MainForm.WindowsForms;
 namespace HeuristicLab.Clients.Hive.ExperimentManager.Views {
   partial class RefreshableHiveExperimentView {
@@ -66 +67 @@
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.refreshButton = new System.Windows.Forms.Button();
+      this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
       this.refreshAutomaticallyCheckBox = new System.Windows.Forms.CheckBox();
       this.infoGroupBox = new System.Windows.Forms.GroupBox();
@@ -74 +76 @@
       this.calculatingLabel = new System.Windows.Forms.Label();
       this.jobsLabel = new System.Windows.Forms.Label();
-      this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
+      this.stateTabPage = new System.Windows.Forms.TabPage();
+      this.stateLogViewHost = new ViewHost();
       this.tabControl.SuspendLayout();
       this.jobsTabPage.SuspendLayout();
       this.logTabPage.SuspendLayout();
       this.infoGroupBox.SuspendLayout();
+      this.stateTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -87 +91 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.jobsTabPage);
+      this.tabControl.Controls.Add(this.stateTabPage);
       this.tabControl.Controls.Add(this.logTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 78);
@@ -126 +131 @@
       this.logTabPage.Location = new System.Drawing.Point(4, 22);
       this.logTabPage.Name = "logTabPage";
-      this.logTabPage.Size = new System.Drawing.Size(813, 494);
+      this.logTabPage.Size = new System.Drawing.Size(709, 426);
       this.logTabPage.TabIndex = 3;
       this.logTabPage.Text = "Log";
@@ -271 +276 @@
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+      // 
+      // isPrivilegedCheckBox
+      // 
+      this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.isPrivilegedCheckBox.AutoSize = true;
+      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(383, 55);
+      this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
+      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
+      this.isPrivilegedCheckBox.TabIndex = 26;
+      this.isPrivilegedCheckBox.Text = "IsPrivileged";
+      this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the job will be executed in a privileged sandbox on the slave.");
+      this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
+      this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckedChanged);
       // 
       // refreshAutomaticallyCheckBox
@@ -353 +371 @@
       this.jobsLabel.Text = "Jobs:";
       // 
-      // isPrivilegedCheckBox
-      // 
-      this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.isPrivilegedCheckBox.AutoSize = true;
-      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(383, 55);
-      this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
-      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
-      this.isPrivilegedCheckBox.TabIndex = 26;
-      this.isPrivilegedCheckBox.Text = "IsPrivileged";
-      this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the job will be executed in a privileged sandbox on the slave.");
-      this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
-      this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckedChanged);
+      // stateTabPage
+      // 
+      this.stateTabPage.Controls.Add(this.stateLogViewHost);
+      this.stateTabPage.Location = new System.Drawing.Point(4, 22);
+      this.stateTabPage.Name = "stateTabPage";
+      this.stateTabPage.Size = new System.Drawing.Size(709, 426);
+      this.stateTabPage.TabIndex = 6;
+      this.stateTabPage.Text = "State";
+      this.stateTabPage.UseVisualStyleBackColor = true;
+      // 
+      // stateLogViewHost
+      // 
+      this.stateLogViewHost.Caption = "StateLog View";
+      this.stateLogViewHost.Content = null;
+      this.stateLogViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.stateLogViewHost.Location = new System.Drawing.Point(0, 0);
+      this.stateLogViewHost.Name = "stateLogViewHost";
+      this.stateLogViewHost.ReadOnly = false;
+      this.stateLogViewHost.Size = new System.Drawing.Size(709, 426);
+      this.stateLogViewHost.TabIndex = 0;
       // 
       // RefreshableHiveExperimentView
@@ -393 +419 @@
       this.infoGroupBox.ResumeLayout(false);
       this.infoGroupBox.PerformLayout();
+      this.stateTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -426 +453 @@
     private System.Windows.Forms.Label jobsLabel;
     private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
+    private System.Windows.Forms.TabPage stateTabPage;
+    private ViewHost stateLogViewHost;
 
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentView.cs

@@ -61 +61 @@
       Content.JobStatisticsChanged += new EventHandler(Content_JobStatisticsChanged);
       Content.ExceptionOccured += new EventHandler<EventArgs<Exception>>(Content_ExceptionOccured);
+      Content.StateLogListChanged += new EventHandler(Content_StateLogListChanged);
     }
 
@@ -69 +70 @@
       Content.JobStatisticsChanged -= new EventHandler(Content_JobStatisticsChanged);
       Content.ExceptionOccured -= new EventHandler<EventArgs<Exception>>(Content_ExceptionOccured);
+      Content.StateLogListChanged -= new EventHandler(Content_StateLogListChanged);
       base.DeregisterContentEvents();
     }
@@ -105 +107 @@
         isPrivilegedCheckBox.Checked = false;
         logView.Content = null;
-        refreshAutomaticallyCheckBox.Checked = false;        
+        refreshAutomaticallyCheckBox.Checked = false;
         logView.Content = null;
       } else {
@@ -120 +122 @@
       Content_HiveJobChanged(this, EventArgs.Empty);
       Content_IsProgressingChanged(this, EventArgs.Empty);
+      Content_StateLogListChanged(this, EventArgs.Empty);
       SetEnabledStateOfControls();
     }
@@ -260 +263 @@
         // show error dialog only if Controllable (otherwise it should continue trying without an error dialog (e.g. HiveEngine))
         ErrorHandling.ShowErrorDialog(this, e.Value);
+      }
+    }
+    private void Content_StateLogListChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_StateLogListChanged), sender, e);
+      else {
+        UpdateStateLogList();
+      }
+    }
+
+    private void UpdateStateLogList() {
+      if (Content != null && this.Content.HiveExperiment != null) {
+        stateLogViewHost.Content = this.Content.HiveExperiment.StateLogList;
+      } else {
+        stateLogViewHost.Content = null;
       }
     }