Changeset 932 for trunk/sources/HeuristicLab.Hive.Client.Core

Timestamp:

12/10/08 11:15:47 (16 years ago)

Author:

kgrading

Message:

implementation for #425

Location:

trunk/sources/HeuristicLab.Hive.Client.Core

Files:

• ClientConsoleService/ClientConsoleCommunicator.cs (modified) (2 diffs)
• ClientConsoleService/Interfaces/IClientConsoleCommunicator.cs (modified) (1 diff)
• ClientConsoleService/TransferObjects/StatusCommons.cs (modified) (1 diff)
• ConfigurationManager (added)
• ConfigurationManager.cs (deleted)
• ConfigurationManager/ClientStatusInfo.cs (added)
• ConfigurationManager/ConfigManager.cs (added)
• Core.cs (modified) (7 diffs)
• Heartbeat.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core.csproj (modified) (1 diff)

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

@@ -4 +4 @@
 using System.Text;
 using HeuristicLab.Hive.Client.Core.ClientConsoleService.Interfaces;
+using HeuristicLab.Hive.Client.Core.ConfigurationManager;
+using HeuristicLab.Hive.Client.Communication;
 
 namespace HeuristicLab.Hive.Client.Core.ClientConsoleService {
@@ -10 +12 @@
 
     public StatusCommons GetStatusInfos() {
-      throw new NotImplementedException();
+      return ConfigManager.Instance.GetStatusForClientConsole();
     }
 
     public ConnectionContainer GetConnection() {
-      throw new NotImplementedException();
+      return new ConnectionContainer{IPAdress = WcfService.Instance.ServerIP, Port = WcfService.Instance.ServerPort } ;
     }
 
     public void SetConnection(ConnectionContainer container) {
-      throw new NotImplementedException();
+      WcfService.Instance.Connect(container.IPAdress, container.Port);
+    }
+
+    public void Disconnect() {
+      WcfService.Instance.Disconnect();
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/ClientConsoleService/Interfaces/IClientConsoleCommunicator.cs

@@ -14 +14 @@
     [OperationContract]
     void SetConnection(ConnectionContainer container);
+    [OperationContract]
+    void Disconnect();
   }
 }

trunk/sources/HeuristicLab.Hive.Client.Core/ClientConsoleService/TransferObjects/StatusCommons.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using HeuristicLab.Hive.Client.Common;
 
 namespace HeuristicLab.Hive.Client.Core.ClientConsoleService {
   [Serializable]
-  public class StatusCommons {
-    public enum ClientStatusEnum { Connected, Disconnected, ConnInterrupted };
+  public class StatusCommons {    
     public Guid ClientGuid { get; set; }
-    public ClientStatusEnum Status { get; set; }
+    public NetworkEnum.WcfConnState Status { get; set; }
     public DateTime ConnectedSince { get; set; }
     public int JobsFetched { get; set; }

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

@@ -40 +40 @@
 using System.ServiceModel.Description;
 using HeuristicLab.Hive.Client.Core.ClientConsoleService;
+using HeuristicLab.Hive.Client.Core.ConfigurationManager;
 
 
@@ -57 +58 @@
       server.StartClientConsoleServer(new Uri("net.tcp://127.0.0.1:8000/ClientConsole/"));
 
-      ConfigurationManager manager = ConfigurationManager.GetInstance();
+      ConfigManager manager = ConfigManager.Instance;
       manager.Core = this;
 
       wcfService = WcfService.Instance;
-      wcfService.Connect("192.168.132.1", "9000");
+      wcfService.Connect("10.20.53.1", 9000);
 
       wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
@@ -67 +68 @@
       wcfService.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
       wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
+      wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
 
-      wcfService.LoginAsync(ConfigurationManager.GetInstance().GetClientInfo());
+      wcfService.LoginAsync(ConfigManager.Instance.GetClientInfo());
 
       Heartbeat beat = new Heartbeat { Interval = 10000 };
@@ -115 +117 @@
       byte[] sJob = engines[jId].GetFinishedJob();
       
-      JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = ConfigurationManager.GetInstance().GetClientInfo() };
+      JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = ConfigManager.Instance.GetClientInfo() };
       wcfService.SendJobResultAsync(jobResult, true);
     }
@@ -135 +137 @@
       if (e.Result.Success) {
         Logging.GetInstance().Info(this.ToString(), "Login completed to Hive Server @ " + DateTime.Now);
-        ConfigurationManager.GetInstance().Loggedin();
-        Status.LoginTime = DateTime.Now;
-        Status.LoggedIn = true;
+        ConfigManager.Instance.Loggedin();        
       } else
         Logging.GetInstance().Error(this.ToString(), e.Result.StatusMessage);
@@ -156 +156 @@
       engines.Add(e.Result.JobId, engine);
 
-      Status.CurrentJobs++;
+      ClientStatusInfo.JobsFetched++;
 
-      Debug.WriteLine("Increment CurrentJobs to:"+Status.CurrentJobs.ToString());
+      Debug.WriteLine("Increment FetchedJobs to:"+ClientStatusInfo.JobsFetched);
     }
 
@@ -166 +166 @@
         appDomains.Remove(e.Result.JobId);
         engines.Remove(e.Result.JobId);
-        Status.CurrentJobs--;
-        Debug.WriteLine("Decrement CurrentJobs to:" + Status.CurrentJobs.ToString());
+        ClientStatusInfo.JobsProcessed++;
+        Debug.WriteLine("ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);
       } else {
         Debug.WriteLine("Job sending FAILED!");
       }
     }
+
+    void wcfService_ServerChanged(object sender, EventArgs e) {
+      foreach(KeyValuePair<long, AppDomain> entries in appDomains)
+        AppDomain.Unload(appDomains[entries.Key]);
+      appDomains = new Dictionary<long, AppDomain>();
+      engines = new Dictionary<long, Executor>();
+    }
+
 
     #endregion

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

@@ -74 +74 @@
                                                               freeMemory = 1000, 
                                                               jobProgress = 1};
-      if (wcfService.ConnState == WcfService.ConnectionState.failed) {
+      if (wcfService.ConnState == NetworkEnum.WcfConnState.Failed) {
         wcfService.Connect();
-      } else if (wcfService.ConnState == WcfService.ConnectionState.connected) {
+      } else if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) {
         wcfService.SendHeartBeatAsync(heartBeatData);
       }

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

@@ -76 +76 @@
     <Compile Include="ClientConsoleService\TransferObjects\JobStatus.cs" />
     <Compile Include="ClientConsoleService\TransferObjects\StatusCommons.cs" />
-    <Compile Include="ConfigurationManager.cs" />
+    <Compile Include="ConfigurationManager\ClientStatusInfo.cs" />
+    <Compile Include="ConfigurationManager\ConfigManager.cs" />
     <Compile Include="Core.cs" />
     <Compile Include="CoreApplication.cs" />