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

Timestamp:

12/17/08 14:46:06 (15 years ago)

Author:

svonolfe

Message:

Implemented JobResultsAdapter (#372)

File:

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

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

@@ -51 +51 @@
     Dictionary<long, Executor> engines = new Dictionary<long, Executor>();
     Dictionary<long, AppDomain> appDomains = new Dictionary<long, AppDomain>();
-    
+    Dictionary<long, Job> jobs = new Dictionary<long, Job>();
+
     private WcfService wcfService;
 
@@ -118 +119 @@
       long jId = (long)jobId;
       byte[] sJob = engines[jId].GetFinishedJob();
-      
-      JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = ConfigManager.Instance.GetClientInfo() };
+
+      JobResult jobResult = new JobResult { Job = jobs[jId], Result = sJob, Client = ConfigManager.Instance.GetClientInfo() };
       wcfService.SendJobResultAsync(jobResult, true);      
     }
@@ -148 +149 @@
 
         PluginManager.Manager.Initialize();
-        AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed, typeof(TestJob));
+        AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(TestJob));
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
 
-        appDomains.Add(e.Result.JobId, appDomain);
+        jobs.Add(e.Result.Job.Id, e.Result.Job);
+        appDomains.Add(e.Result.Job.Id, appDomain);
 
         Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-        engine.JobId = e.Result.JobId;
+        engine.JobId = e.Result.Job.Id;
         engine.Queue = MessageQueue.GetInstance();
         engine.Start(e.Result.SerializedJob);
-        engines.Add(e.Result.JobId, engine);
+        engines.Add(e.Result.Job.Id, engine);
 
         ClientStatusInfo.JobsFetched++;
@@ -167 +169 @@
     void wcfService_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
       if (e.Result.Success) {
-        AppDomain.Unload(appDomains[e.Result.JobId]);
-        appDomains.Remove(e.Result.JobId);
-        engines.Remove(e.Result.JobId);
+        AppDomain.Unload(appDomains[e.Result.Job.Id]);
+        appDomains.Remove(e.Result.Job.Id);
+        engines.Remove(e.Result.Job.Id);
         ClientStatusInfo.JobsProcessed++;
         Debug.WriteLine("ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);