Changeset 908

Timestamp:

12/04/08 17:22:34 (16 years ago)

Author:

kgrading

Message:

implemented the Status method for the web interface (#401)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/ClientConsoleCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/ConfigurationManager.cs (modified) (4 diffs)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.ExecutionEngine/Executor.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Communication/ClientConsoleCommunicator.cs

@@ -4 +4 @@
 using System.Text;
 using HeuristicLab.Hive.Client.Communication.Interfaces;
-using HeuristicLab.Hive.Client.Communication.ClientConsole;
+using HeuristicLab.Hive.Client.Communication.ClientConsole; 
 
 namespace HeuristicLab.Hive.Client.Communication {

trunk/sources/HeuristicLab.Hive.Client.Core/ConfigurationManager.cs

@@ -25 +25 @@
 using System.Text;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Client.Communication.ClientConsole;
+using HeuristicLab.Hive.Client.ExecutionEngine;
 
 namespace HeuristicLab.Hive.Client.Core {
@@ -33 +35 @@
     private static ConfigurationManager instance = null;
 
-    private ClientInfo clientInfo;
+    public Core Core { get; set; }
+    private ClientInfo clientInfo;    
     private Guid guid;
 
@@ -42 +45 @@
       return instance;
     }
+
+   
 
     /// <summary>
@@ -55 +60 @@
       clientInfo.Memory = 1024;
       clientInfo.Name = Environment.MachineName;
+
     }
 
     public ClientInfo GetClientInfo() {
       return clientInfo;          
+    }
+
+    public StatusCommons GetStatusForClient() {
+      StatusCommons st = new StatusCommons();
+      st.ClientGuid = guid;
+      st.ConnectedSince = clientInfo.Login;
+      //This is just Temporary!
+      st.JobsAborted = 0;
+      st.JobsDone = 0;
+      st.JobsFetched = 0;
+      st.Status = StatusCommons.ClientStatusEnum.Connected;
+
+      Dictionary<long, Executor> engines = Core.GetExecutionEngines();
+      foreach (KeyValuePair<long, Executor> kvp in engines) {
+        Executor e = kvp.Value;
+        st.Jobs.Add(new JobStatus { JobId = e.JobId, Progress = e.Progress, Since = e.CreationTime });
+      }
+      return st;      
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -56 +56 @@
       ClientConsoleServer server = new ClientConsoleServer();
       server.StartClientConsoleServer(new Uri("net.tcp://127.0.0.1:8000/ClientConsole/"));
+
+      ConfigurationManager manager = ConfigurationManager.GetInstance();
+      manager.Core = this;
 
       clientCommunicator = ServiceLocator.GetClientCommunicator();
@@ -155 +158 @@
       }
     }
+
+    public Dictionary<long, Executor> GetExecutionEngines() {
+      return engines;
+    }
   }
 }

trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/Executor.cs

@@ -37 +37 @@
     public MessageContainer.MessageType CurrentMessage { get; set; }
     public MessageQueue Queue { get; set; }
+    public double Progress {
+      get {
+        return Job.Progress;
+      }
+    }
 
-    public void Start(byte[] serializedJob) {      
+    public DateTime CreationTime { get; set; }
+
+    public void Start(byte[] serializedJob) {
+      CreationTime = DateTime.Now;
       Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
       Job.JobStopped += new EventHandler(Job_JobStopped);