Changeset 1099 for trunk/sources

Timestamp:

01/08/09 17:17:38 (16 years ago)

Author:

msteinbi

Message:

Implementing Lifecycle Management (#453)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/HeuristicLab.Hive.Contracts.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Core/HeuristicLab.Hive.Server.Core.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ServiceLocator.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server/HiveServerApplication.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Contracts/HeuristicLab.Hive.Contracts.csproj

@@ -85 +85 @@
     <Compile Include="BusinessObjects\User.cs" />
     <Compile Include="BusinessObjects\UserGroup.cs" />
+    <Compile Include="Interfaces\IClientFacade.cs" />
     <Compile Include="ResponseObject.cs" />
     <Compile Include="Interfaces\IClientManager.cs" />

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -19 +19 @@
   public class ClientCommunicator: IClientCommunicator {
     int nrOfJobs = 0;
-    Dictionary<Guid, DateTime> lastHeartbeats;
+    Dictionary<Guid, DateTime> lastHeartbeats = 
+      new Dictionary<Guid,DateTime>();
 
     IClientAdapter clientAdapter;
@@ -57 +58 @@
           } else {
             DateTime lastHbOfClient = lastHeartbeats[client.ClientId];
-            int diff = lastHbOfClient.CompareTo(DateTime.Now);
-            Console.WriteLine(diff);
+            TimeSpan dif = DateTime.Now.Subtract(lastHbOfClient);
+            Console.WriteLine(dif);
           }
         } else {
@@ -124 +125 @@
     }
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     public ResponseJob PullJob(Guid clientId) {
       ResponseJob response = new ResponseJob();
@@ -144 +146 @@
     }
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     public ResponseResultReceived SendJobResult(JobResult result, bool finished) {
       ResponseResultReceived response = new ResponseResultReceived();

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

@@ -67 +67 @@
   <ItemGroup>
     <Compile Include="ClientCommunicator.cs" />
+    <Compile Include="ClientFacade.cs" />
     <Compile Include="ClientManager.cs" />
     <Compile Include="DbTestApp.cs" />

trunk/sources/HeuristicLab.Hive.Server.Core/ServerConsoleFacade.cs

@@ -30 +30 @@
 namespace HeuristicLab.Hive.Server.Core {
   public class ServerConsoleFacade: IServerConsoleFacade {
-    private IClientManager clientManager = new ClientManager();
-    private IJobManager jobManager = new JobManager();
-    private IUserRoleManager userRoleManager = new UserRoleManager();
+    private IClientManager clientManager = 
+      ServiceLocator.GetClientManager();
+
+    private IJobManager jobManager = 
+      ServiceLocator.GetJobManager();
+
+    private IUserRoleManager userRoleManager = 
+      ServiceLocator.GetUserRoleManager();
 
     private String loginName = null;

trunk/sources/HeuristicLab.Hive.Server.Core/ServiceLocator.cs

@@ -24 +24 @@
 using System.Runtime.CompilerServices;
 using HeuristicLab.Hive.Contracts.Interfaces;
+using HeuristicLab.Hive.Server.Core;
 
 /// <summary>
@@ -34 +35 @@
   private static ITransactionManager transManager = null;
 
+  private static IClientManager clientManager = null;
+
+  private static IJobManager jobManager = null;
+
+  private static IUserRoleManager userRoleManager = null;
+
+  private static IClientCommunicator clientCommunicator = null;
+
+  private static ILifecycleManager lifecycleManager = null;
+
   private static IClientAdapter clientAdapter = null;
 
@@ -50 +61 @@
   private static IJobResultsAdapter jobResultsAdapter = null;
 
-  private static ILifecycleManager lifecycleManager = null;
 
   /// <summary>
@@ -66 +76 @@
 
   /// <summary>
+  /// Gets the client manager
+  /// </summary>
+  /// <returns></returns>
+  [MethodImpl(MethodImplOptions.Synchronized)]
+  public static IClientManager GetClientManager() {
+    if (clientManager == null)
+      clientManager = new ClientManager();
+
+    return clientManager;
+  }
+
+  /// <summary>
+  /// Gets the job manager
+  /// </summary>
+  /// <returns></returns>
+  [MethodImpl(MethodImplOptions.Synchronized)]
+  public static IJobManager GetJobManager() {
+    if (jobManager == null)
+      jobManager = new JobManager();
+
+    return jobManager;
+  }
+
+  /// <summary>
+  /// Gets the user role manager
+  /// </summary>
+  /// <returns></returns>
+  [MethodImpl(MethodImplOptions.Synchronized)]
+  public static IUserRoleManager GetUserRoleManager() {
+    if (userRoleManager == null)
+      userRoleManager = new UserRoleManager();
+
+    return userRoleManager;
+  }
+
+  /// <summary>
+  /// Gets the client Communicator
+  /// </summary>
+  /// <returns></returns>
+  [MethodImpl(MethodImplOptions.Synchronized)]
+  public static IClientCommunicator GetClientCommunicator() {
+    if (clientCommunicator == null)
+      clientCommunicator = new ClientCommunicator();
+
+    return clientCommunicator;
+  }
+
+  /// <summary>
+  /// Gets the lifecycle manager
+  /// </summary>
+  /// <returns></returns>
+  [MethodImpl(MethodImplOptions.Synchronized)]
+  public static ILifecycleManager GetLifecycleManager() {
+    if (lifecycleManager == null) {
+      lifecycleManager = new LifecycleManager();
+    }
+
+    return lifecycleManager;
+  }
+
+  /// <summary>
   /// Gets the client database adapter
   /// </summary>
@@ -168 +239 @@
     return jobResultsAdapter;
   }
-
-  /// <summary>
-  /// Gets the lifecycle manager
-  /// </summary>
-  /// <returns></returns>
-  [MethodImpl(MethodImplOptions.Synchronized)]
-  public static ILifecycleManager GetLifecycleManager() {
-    if (lifecycleManager == null) {
-      lifecycleManager = discoveryService.GetInstances<ILifecycleManager>()[0];
-    }
-
-    return lifecycleManager;
-  }
 }

trunk/sources/HeuristicLab.Hive.Server/HiveServerApplication.cs

@@ -57 +57 @@
 
     private ServiceHost StartClientCommunicator(Uri uriTcp) {
-      IClientCommunicator[] clientCommunicatorInstances =
-        discService.GetInstances<IClientCommunicator>();
+      IClientFacade[] clientCommunicatorInstances =
+        discService.GetInstances<IClientFacade>();
 
       if (clientCommunicatorInstances.Length > 0) {