Changeset 923

Timestamp:

12/07/08 16:14:00 (15 years ago)

Author:

kgrading

Message:

refactoring of the WCF Service for the Server (#418)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/HeuristicLab.Hive.Client.Communication.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Client.Communication/WcfService.cs (added)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (9 diffs)
• HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (3 diffs)

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

@@ -71 +71 @@
     <Compile Include="ServerProxy.cs" />
     <Compile Include="ServiceLocator.cs" />
+    <Compile Include="WcfService.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -80 +81 @@
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
       <Name>HeuristicLab.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Hive.Client.Common\HeuristicLab.Hive.Client.Common.csproj">
+      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
+      <Name>HeuristicLab.Hive.Client.Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Hive.Contracts\HeuristicLab.Hive.Contracts.csproj">

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

@@ -50 +50 @@
     Dictionary<long, AppDomain> appDomains = new Dictionary<long, AppDomain>();
 
-    private ClientCommunicatorClient clientCommunicator;
+    private WcfService wcfService;
 
     public void Start() {
@@ -60 +60 @@
       manager.Core = this;
 
-      clientCommunicator = ServiceLocator.GetClientCommunicator();
-      clientCommunicator.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(ClientCommunicator_LoginCompleted);
-      clientCommunicator.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(ClientCommunicator_PullJobCompleted);
-      clientCommunicator.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(ClientCommunicator_SendJobResultCompleted);
-      //clientCommunicator.LoginAsync(ConfigurationManager.GetInstance().GetClientInfo());
+      wcfService = WcfService.Instance;
+      wcfService.Connect("192.168.132.1", "9000");
+
+      wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
+      wcfService.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(wcfService_PullJobCompleted);
+      wcfService.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
+
+      wcfService.LoginAsync(ConfigurationManager.GetInstance().GetClientInfo());
 
       Heartbeat beat = new Heartbeat { Interval = 10000 };
@@ -76 +79 @@
         DetermineAction(container);
       }
-    }
-
-    void ClientCommunicator_LoginCompleted(object sender, LoginCompletedEventArgs e) {
-      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;
-      } else
-        Logging.GetInstance().Error(this.ToString(), e.Result.StatusMessage);
     }
 
@@ -106 +99 @@
 
         case MessageContainer.MessageType.FetchJob: 
-          clientCommunicator.PullJobAsync(Guid.NewGuid());
+          wcfService.PullJobAsync(Guid.NewGuid());
           break;          
         case MessageContainer.MessageType.FinishedJob:
@@ -115 +108 @@
     }
 
+    #region Async Threads for the EE
+    
     private void GetFinishedJob(object jobId) {
       long jId = (long)jobId;
@@ -120 +115 @@
       
       JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = ConfigurationManager.GetInstance().GetClientInfo() };
-      clientCommunicator.SendJobResultAsync(jobResult, true);
+      wcfService.SendJobResultAsync(jobResult, true);
     }
 
@@ -128 +123 @@
     }
 
-    void ClientCommunicator_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
+    #endregion
+
+    #region wcfService Events
+
+    void wcfService_LoginCompleted(object sender, LoginCompletedEventArgs e) {
+      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;
+      } else
+        Logging.GetInstance().Error(this.ToString(), e.Result.StatusMessage);
+    }    
+
+    void wcfService_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
       bool sandboxed = false;
 
@@ -147 +156 @@
     }
 
-    void ClientCommunicator_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
+    void wcfService_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
       if (e.Result.Success) {
         AppDomain.Unload(appDomains[e.Result.JobId]);
@@ -159 +168 @@
     }
 
+    #endregion
+
     public Dictionary<long, Executor> GetExecutionEngines() {
       return engines;

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

@@ -48 +48 @@
     }
 
-    private ClientCommunicatorClient clientCommunicator;
+    private WcfService wcfService;
 
     /// <summary>
@@ -58 +58 @@
       heartbeatTimer.AutoReset = true;
       heartbeatTimer.Elapsed += new ElapsedEventHandler(heartbeatTimer_Elapsed);
-      clientCommunicator = ServiceLocator.GetClientCommunicator();
-      clientCommunicator.SendHeartBeatCompleted += new EventHandler<SendHeartBeatCompletedEventArgs>(ClientCommunicator_SendHeartBeatCompleted);
+      wcfService = WcfService.Instance;
+      wcfService.SendHeartBeatCompleted += new EventHandler<SendHeartBeatCompletedEventArgs>(wcfService_SendHeartBeatCompleted);
       heartbeatTimer.Start();
     }
@@ -74 +74 @@
                                                               freeMemory = 1000, 
                                                               jobProgress = 1};
-      clientCommunicator.SendHeartBeatAsync(heartBeatData);
+      if (wcfService.ConnState == WcfService.ConnectionState.failed) {
+        wcfService.Connect();
+      } else if (wcfService.ConnState == WcfService.ConnectionState.connected) {
+        wcfService.SendHeartBeatAsync(heartBeatData);
+      }
     }
 
-    void ClientCommunicator_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
+    void wcfService_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
       System.Diagnostics.Debug.WriteLine("Heartbeat received! ");
       e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));