Changeset 5451

Timestamp:

02/07/11 16:49:22 (13 years ago)

Author:

ascheibe

Message:

#1233

• added Sleep cmd
• adapted gui for new cmds

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/MainWindow.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunication.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Common/3.4/MessageContainer.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/MainWindow.cs

@@ -49 +49 @@
       } else {
         if (Content != null) {
-          Content.HardPauseCore();
+          Content.StopAll();
         }
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs

@@ -92 +92 @@
     }
 
-    public void SoftPauseCore() {
+    public void PauseAll() {
       try {
         if (pipeFactory.State != CommunicationState.Faulted && pipeFactory.State != CommunicationState.Closed)
-          pipeProxy.StopAll();
+          pipeProxy.PauseAll();
       }
       catch (Exception e) {
@@ -102 +102 @@
     }
 
-    public void HardPauseCore() {
+    public void StopAll() {
       try {
         if (pipeFactory.State != CommunicationState.Faulted && pipeFactory.State != CommunicationState.Closed)
-          pipeProxy.PauseAll();
+          pipeProxy.StopAll();
       }
       catch (Exception e) {
@@ -122 +122 @@
     }
 
+    public void Sleep() {
+      try {
+        if (pipeFactory.State != CommunicationState.Faulted && pipeFactory.State != CommunicationState.Closed)
+          pipeProxy.Sleep();
+      }
+      catch (Exception e) {
+        OnMessageLogged("Error sending core to sleep: " + e.ToString());
+      }
+    }
+
     public void Close() {
       if (pipeFactory.State != CommunicationState.Closed) {
@@ -130 +140 @@
 
     public event EventHandler<EventArgs<StatusCommons>> SlaveStatusChanged;
-    public void OnStatusChanged(StatusCommons status) {      
+    public void OnStatusChanged(StatusCommons status) {
       var handler = SlaveStatusChanged;
       if (handler != null) handler(this, new EventArgs<StatusCommons>(status));
@@ -136 +146 @@
 
     public event EventHandler<EventArgs<string>> SlaveMessageLogged;
-    public void OnMessageLogged(string message) {      
+    public void OnMessageLogged(string message) {
       var handler = SlaveMessageLogged;
       if (handler != null) handler(this, new EventArgs<string>(message));
@@ -142 +152 @@
 
     public event EventHandler SlaveShutdown;
-    public void OnShutdown() {      
+    public void OnShutdown() {
       var handler = SlaveShutdown;
       if (handler != null) handler(this, EventArgs.Empty);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.Designer.cs

@@ -47 +47 @@
       this.label1 = new System.Windows.Forms.Label();
       this.txtLog = new System.Windows.Forms.TextBox();
-      this.btnSoftPause = new System.Windows.Forms.Button();
-      this.btnHardPause = new System.Windows.Forms.Button();
+      this.btnPauseAll = new System.Windows.Forms.Button();
+      this.btnStopAll = new System.Windows.Forms.Button();
       this.btnRestart = new System.Windows.Forms.Button();
+      this.btnSleep = new System.Windows.Forms.Button();
       this.SuspendLayout();
       // 
@@ -72 +73 @@
       this.txtLog.TabIndex = 1;
       // 
-      // btnSoftPause
+      // btnPauseAll
       // 
-      this.btnSoftPause.Location = new System.Drawing.Point(390, 46);
-      this.btnSoftPause.Name = "btnSoftPause";
-      this.btnSoftPause.Size = new System.Drawing.Size(111, 23);
-      this.btnSoftPause.TabIndex = 2;
-      this.btnSoftPause.Text = "Soft Pause Core";
-      this.btnSoftPause.UseVisualStyleBackColor = true;
-      this.btnSoftPause.Click += new System.EventHandler(this.btnSoftPause_Click);
+      this.btnPauseAll.Location = new System.Drawing.Point(390, 24);
+      this.btnPauseAll.Name = "btnPauseAll";
+      this.btnPauseAll.Size = new System.Drawing.Size(111, 23);
+      this.btnPauseAll.TabIndex = 2;
+      this.btnPauseAll.Text = "Pause all jobs";
+      this.btnPauseAll.UseVisualStyleBackColor = true;
+      this.btnPauseAll.Click += new System.EventHandler(this.btnSoftPause_Click);
       // 
-      // btnHardPause
+      // btnStopAll
       // 
-      this.btnHardPause.Location = new System.Drawing.Point(390, 87);
-      this.btnHardPause.Name = "btnHardPause";
-      this.btnHardPause.Size = new System.Drawing.Size(111, 23);
-      this.btnHardPause.TabIndex = 3;
-      this.btnHardPause.Text = "Hard Pause Core";
-      this.btnHardPause.UseVisualStyleBackColor = true;
-      this.btnHardPause.Click += new System.EventHandler(this.btnHardPause_Click);
+      this.btnStopAll.Location = new System.Drawing.Point(390, 53);
+      this.btnStopAll.Name = "btnStopAll";
+      this.btnStopAll.Size = new System.Drawing.Size(111, 23);
+      this.btnStopAll.TabIndex = 3;
+      this.btnStopAll.Text = "Stop all jobs";
+      this.btnStopAll.UseVisualStyleBackColor = true;
+      this.btnStopAll.Click += new System.EventHandler(this.btnHardPause_Click);
       // 
       // btnRestart
       // 
-      this.btnRestart.Location = new System.Drawing.Point(390, 127);
+      this.btnRestart.Location = new System.Drawing.Point(390, 111);
       this.btnRestart.Name = "btnRestart";
       this.btnRestart.Size = new System.Drawing.Size(111, 23);
@@ -102 +103 @@
       this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
       // 
+      // btnSleep
+      // 
+      this.btnSleep.Location = new System.Drawing.Point(390, 82);
+      this.btnSleep.Name = "btnSleep";
+      this.btnSleep.Size = new System.Drawing.Size(111, 23);
+      this.btnSleep.TabIndex = 5;
+      this.btnSleep.Text = "Send slave to sleep";
+      this.btnSleep.UseVisualStyleBackColor = true;
+      this.btnSleep.Click += new System.EventHandler(this.btnSleep_Click);
+      // 
       // SlaveView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.btnSleep);
       this.Controls.Add(this.btnRestart);
-      this.Controls.Add(this.btnHardPause);
-      this.Controls.Add(this.btnSoftPause);
+      this.Controls.Add(this.btnStopAll);
+      this.Controls.Add(this.btnPauseAll);
       this.Controls.Add(this.txtLog);
       this.Controls.Add(this.label1);
@@ -122 +134 @@
     private System.Windows.Forms.Label label1;
     private System.Windows.Forms.TextBox txtLog;
-    private System.Windows.Forms.Button btnSoftPause;
-    private System.Windows.Forms.Button btnHardPause;
+    private System.Windows.Forms.Button btnPauseAll;
+    private System.Windows.Forms.Button btnStopAll;
     private System.Windows.Forms.Button btnRestart;
+    private System.Windows.Forms.Button btnSleep;
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs

@@ -96 +96 @@
     private void btnSoftPause_Click(object sender, System.EventArgs e) {
       if (Content != null)
-        Content.SoftPauseCore();
+        Content.PauseAll();
     }
 
     private void btnHardPause_Click(object sender, System.EventArgs e) {
       if (Content != null)
-        Content.HardPauseCore();
+        Content.StopAll();
     }
 
@@ -108 +108 @@
         Content.RestartCore();
     }
+
+    private void btnSleep_Click(object sender, System.EventArgs e) {
+      if (Content != null)
+        Content.Sleep();
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -140 +140 @@
       } else if (container is MessageContainer) {
         switch (container.Message) {
-          //Pull a Job from the Server
           case MessageContainer.MessageType.CalculateJob:
             Job myJob = wcfService.GetJob(container.JobId);
@@ -147 +146 @@
             StartJobInAppDomain(myJob, jobData);
             break;
-
           case MessageContainer.MessageType.ShutdownSlave:
             ShutdownCore();
@@ -171 +169 @@
           case MessageContainer.MessageType.Restart:
             DoStartSlave();
+            break;
+          case MessageContainer.MessageType.Sleep:
+            Sleep();
             break;
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using HeuristicLab.Common;
@@ -94 +93 @@
                 FreeCores = info.Cores.HasValue ? info.Cores.Value - ConfigManager.Instance.GetUsedCores() : 0,
                 FreeMemory = ConfigManager.GetFreeMemory(),
-                JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs()
+                JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs(),
+                AssignJob = true //TODO: check if we want another job
               };
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs

@@ -125 +125 @@
         CopyFile(baseDir, targetDir, "HeuristicLab.Services.Hive.Common-3.4.dll");
         CopyFile(baseDir, targetDir, "HeuristicLab.Hive-3.4.dll");
+        CopyFile(baseDir, targetDir, "HeuristicLab.Clients.Common-3.3.dll");
 
         //TODO: remove, just needed for unit tests

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunication.cs

@@ -38 +38 @@
 
     [OperationContract]
+    void Sleep();
+
+    [OperationContract]
     void PauseAll();
 
@@ -48 +51 @@
     [OperationContract]
     void ShutdownSlave();
-
 
     //callbacks

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.cs

@@ -107 +107 @@
       MessageQueue.GetInstance().AddMessage(mc);
     }
+
+    public void Sleep() {
+      MessageContainer mc = new MessageContainer(MessageContainer.MessageType.Sleep);
+      MessageQueue.GetInstance().AddMessage(mc);
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/MessageContainer.cs

@@ -42 +42 @@
       PauseJob,  // pause the job and submit the results   
       PauseAll,  // pause all jobs and submit results
-      Restart,        //restart operation after Soft/HardPause
+      Restart,   // restart operation after Sleep
+      Sleep,     // disconnect from server, but don't shutdown
       ShutdownSlave,  // slave should shutdown immediately without submitting results
       SayHello,  // Slave should say hello, because he is unknown to the server