Changeset 830 for trunk/sources

Timestamp:

11/26/08 16:49:55 (16 years ago)

Author:

kgrading

Message:

continued work from #390, removed a fake CreateJob method and replaced all fake Jobs with real ones.

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/Core.cs (modified) (5 diffs)
• HeuristicLab.Hive.Client.ExecutionEngine/Executor.cs (modified) (1 diff)

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

@@ -76 +76 @@
       clientCommunicator.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(ClientCommunicator_LoginCompleted);
       clientCommunicator.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(ClientCommunicator_PullJobCompleted);
+      clientCommunicator.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(ClientCommunicator_SendJobResultCompleted);
       clientCommunicator.LoginAsync(clientInfo);
 
@@ -141 +142 @@
     private void GetFinishedJob(object jobId) {
       long jId = (long)jobId;
-      byte[] obj = engines[jId].GetFinishedJob();
+      byte[] sJob = engines[jId].GetFinishedJob();
       
+      JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = null };
+      clientCommunicator.SendJobResultAsync(jobResult, true);
+
       AppDomain.Unload(appDomains[jId]);
       appDomains.Remove(jId);
       engines.Remove(jId);
+      Status.CurrentJobs--;
+      Debug.WriteLine("Decrement CurrentJobs to:" + Status.CurrentJobs.ToString());        
 
-      Status.CurrentJobs--;
-      Debug.WriteLine("Decrement CurrentJobs to:" + Status.CurrentJobs.ToString());      
     }
 
@@ -159 +163 @@
       bool sandboxed = false;
 
-      IJob job = new TestJob { JobId = e.Result.JobId };
+      //IJob job = new TestJob { JobId = e.Result.JobId };
 
       PluginManager pm = PluginManager.Manager;
@@ -165 +169 @@
 
       //AppDomain appDomain = CreateNewAppDomain(sandboxed);
-      appDomains.Add(job.JobId, appDomain);
+      appDomains.Add(e.Result.JobId, appDomain);
 
       Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-      engine.JobId = job.JobId;
+      engine.JobId = e.Result.JobId;
       engine.Queue = MessageQueue.GetInstance();
-      engine.Start();
-      engines.Add(engine.JobId, engine);
+      engine.Start(e.Result.SerializedJob);
+      engines.Add(e.Result.JobId, engine);
 
       Status.CurrentJobs++;
@@ -178 +182 @@
     }
 
-    /// <summary>
-    /// Simulator Class for new Jobs. will be replaced with fetching Jobs from the Interface
-    /// </summary>
-    /// <returns></returns>
-    private IJob CreateNewJob() {
-      Random random = new Random();
-      IJob job = new TestJob();
-      job.JobId = random.Next();
-      return job;
+    void ClientCommunicator_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {      
+      // TODO Removing of the Engines & AppDomains should happen here, not in the GetFinishedJob Method.
     }
   }

trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/Executor.cs

@@ -38 +38 @@
     public MessageQueue Queue { get; set; }
 
-    public void Start() {
+    public void Start(byte[] serializedJob) {      
+      Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
       Job.JobStopped += new EventHandler(Job_JobStopped);
       Job.Start();