Changeset 7255 for branches/RegressionBenchmarks/HeuristicLab.Services.Hive/3.3/Manager

Timestamp:

01/02/12 11:40:31 (13 years ago)

Author:

sforsten

Message:

#1708: merged r7209 from trunk

• adjusted GUI
• added toggle for the different series
• X Axis labels are rounded to useful values
• added ToolTip

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (1 diff)

branches/RegressionBenchmarks/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -41 +41 @@
       get { return LogFactory.GetLogger(this.GetType().Namespace); }
     }
+    private DataAccess.ITransactionManager trans {
+      get { return ServiceLocator.Instance.TransactionManager; }
+    }
 
-    public void Cleanup() {
-      log.Log("EventManager.Cleanup()");
-      SetTimeoutSlavesOffline();
-      SetTimeoutTasksWaiting();
-      FinishParentTasks();
-      UpdateStatistics();
+    public void Cleanup() { 
+      trans.UseTransaction(() => {
+        SetTimeoutSlavesOffline();
+        SetTimeoutTasksWaiting();
+      }, true);
+
+      trans.UseTransaction(() => {
+        FinishParentTasks();
+        UpdateStatistics();
+      }, false);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -44 +44 @@
       if (slave == null) {
         actions.Add(new MessageContainer(MessageContainer.MessageType.SayHello));
-      } else {
-        Slave s = dao.GetSlave(heartbeat.SlaveId);
-        if (s != null) {
-          if (heartbeat.HbInterval != s.HbInterval) {
-            actions.Add(new MessageContainer(MessageContainer.MessageType.NewHBInterval));
-          }
+      } else {        
+        if (heartbeat.HbInterval != slave.HbInterval) {
+          actions.Add(new MessageContainer(MessageContainer.MessageType.NewHBInterval));
         }
-
+        
         // update slave data
         slave.FreeCores = heartbeat.FreeCores;