Changeset 1449 for trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

Timestamp:

03/27/09 14:04:47 (15 years ago)

Author:

svonolfe

Message:

Refactored DAL (now using GUIDs as IDs instead of longs) (#527)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs (modified) (7 diffs)

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

@@ -52 +52 @@
   public class Core: MarshalByRefObject {       
     public static bool abortRequested { get; set; }
-        
-    private Dictionary<long, Executor> engines = new Dictionary<long, Executor>();
-    private Dictionary<long, AppDomain> appDomains = new Dictionary<long, AppDomain>();
-    private Dictionary<long, Job> jobs = new Dictionary<long, Job>();
+
+    private Dictionary<Guid, Executor> engines = new Dictionary<Guid, Executor>();
+    private Dictionary<Guid, AppDomain> appDomains = new Dictionary<Guid, AppDomain>();
+    private Dictionary<Guid, Job> jobs = new Dictionary<Guid, Job>();
 
     private WcfService wcfService;
@@ -129 +129 @@
         //Pull a Job from the Server
         case MessageContainer.MessageType.FetchJob: 
-          wcfService.SendJobAsync(ConfigManager.Instance.GetClientInfo().ClientId);
+          wcfService.SendJobAsync(ConfigManager.Instance.GetClientInfo().Id);
           break;          
         //A Job has finished and can be sent back to the server
@@ -147 +147 @@
     
     private void GetFinishedJob(object jobId) {
-      long jId = (long)jobId;      
+      Guid jId = (Guid)jobId;      
       try {
         byte[] sJob = engines[jId].GetFinishedJob();
 
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
-          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().ClientId,
+          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id,
             jId,
             sJob,
@@ -174 +174 @@
 
     private void GetSnapshot(object jobId) {
-      long jId = (long)jobId;
+      Guid jId = (Guid)jobId;
       byte[] obj = engines[jId].GetSnapshot();
-      wcfService.ProcessSnapshotAsync(ConfigManager.Instance.GetClientInfo().ClientId,
+      wcfService.ProcessSnapshotAsync(ConfigManager.Instance.GetClientInfo().Id,
         jId,
         obj,
@@ -249 +249 @@
       Logging.Instance.Info(this.ToString(), "ServerChanged has been called");
       lock (engines) {
-        foreach (KeyValuePair<long, AppDomain> entries in appDomains)
+        foreach (KeyValuePair<Guid, AppDomain> entries in appDomains)
           AppDomain.Unload(appDomains[entries.Key]);
-        appDomains = new Dictionary<long, AppDomain>();
-        engines = new Dictionary<long, Executor>();
+        appDomains = new Dictionary<Guid, AppDomain>();
+        engines = new Dictionary<Guid, Executor>();
       }
     }
@@ -265 +265 @@
       Logging.Instance.Info(this.ToString(), "Reconnected to old server - checking currently running appdomains");                 
 
-      foreach (KeyValuePair<long, Executor> execKVP in engines) {
+      foreach (KeyValuePair<Guid, Executor> execKVP in engines) {
         if (!execKVP.Value.Running && execKVP.Value.CurrentMessage == MessageContainer.MessageType.NoMessage) {
           Logging.Instance.Info(this.ToString(), "Checking for JobId: " + execKVP.Value.JobId);
@@ -276 +276 @@
     #endregion
 
-    public Dictionary<long, Executor> GetExecutionEngines() {
+    public Dictionary<Guid, Executor> GetExecutionEngines() {
       return engines;
     }