Changeset 779 for trunk/sources

Timestamp:

11/19/08 16:08:44 (16 years ago)

Author:

kgrading

Message:

Continued work on ticket (#365) + created a Job Interface

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Common/HeuristicLab.Hive.Client.Common.csproj (modified) (1 diff)
• HeuristicLab.Hive.Client.Common/Interfaces (added)
• HeuristicLab.Hive.Client.Common/Interfaces/IJob.cs (added)
• HeuristicLab.Hive.Client.Common/JobBase.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Common/TestJob.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.ExecutionEngine/Executor.cs (modified) (3 diffs)

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

@@ -66 +66 @@
   <ItemGroup>
     <Compile Include="CommonPlugin.cs" />
+    <Compile Include="Interfaces\IJob.cs" />
     <Compile Include="JobBase.cs" />
     <Compile Include="Logging.cs" />

trunk/sources/HeuristicLab.Hive.Client.Common/JobBase.cs

@@ -27 +27 @@
 using System.Xml;
 using HeuristicLab.Core;
+using HeuristicLab.Hive.Client.Common;
 
 namespace HeuristicLab.Hive.Client.Common {
   [Serializable]
-  abstract public class JobBase {
+  abstract public class JobBase : IJob {
+
+    public long JobId { get; set; }
 
     private Thread thread = null;

trunk/sources/HeuristicLab.Hive.Client.Common/TestJob.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using System.Diagnostics;
 
 namespace HeuristicLab.Hive.Client.Common {
@@ -33 +34 @@
         if (abort == true) {
           Logging.getInstance().Info(this.ToString(), "Job Processing aborted");
-          //Console.WriteLine("Job Abort Processing");
+          Debug.WriteLine("Job Abort Processing");
           break;
         }
         Logging.getInstance().Info(this.ToString(), "Iteration " + x + " done");
-        //Console.WriteLine("Iteration " + x + " done");
+        Debug.WriteLine("Iteration " + x + " done");
       }      
       OnJobStopped();

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

@@ -58 +58 @@
     }
 
-    public void Start() {
-      Logging.getInstance().Info(this.ToString(), "Info Message");
-      //Logging.getInstance().Error(this.ToString(), "Error Message");
-      //Logging.getInstance().Error(this.ToString(), "Exception Message", new Exception("Exception"));      
-
+    public void Start() {      
       Heartbeat beat = new Heartbeat();
       beat.Interval = 5000;
@@ -68 +64 @@
 
       MessageQueue queue = MessageQueue.GetInstance();
-      
-      TestJob job = new TestJob();
-
-      AppDomain appDomain = CreateNewAppDomain(false);
-      
-      //This is a HACK. remove static directory ASAP
-      //Executor engine = (Executor)appDomain.CreateInstanceFromAndUnwrap(@"C:\Program Files\HeuristicLab 3.0\plugins\HeuristicLab.Hive.Client.ExecutionEngine-3.2.dll", "HeuristicLab.Hive.Client.ExecutionEngine.Executor");
-      
-      Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-      //ExecutionEngine.Executor engine = new ExecutionEngine.Executor();
-      engine.Job = job;
-      engine.JobId = 1L;
-      engine.Queue = queue;      
-      engine.Start();
-      engines.Add(engine.JobId, engine);
-
-      Thread.Sleep(15000);
-      engine.RequestSnapshot();
+      queue.AddMessage(MessageContainer.MessageType.FetchJob);     
       while (true) {
         MessageContainer container = queue.GetMessage();
+        Debug.WriteLine("Main loop received this message: " + container.Message.ToString());
         Logging.getInstance().Info(this.ToString(), container.Message.ToString()); 
         DetermineAction(container);
-
-        
       }
-    }
-
-    Assembly appDomain_TypeResolve(object sender, ResolveEventArgs args) {
-      throw new NotImplementedException();
     }
 
@@ -116 +90 @@
 
     private void DetermineAction(MessageContainer container) {
-      if(container.Message == MessageContainer.MessageType.AbortJob)
-        engines[container.JobId].Abort();
-      else if (container.Message == MessageContainer.MessageType.JobAborted)
-        //kill appdomain
-        Console.WriteLine("tmp");
-      else if (container.Message == MessageContainer.MessageType.RequestSnapshot)
-        engines[container.JobId].RequestSnapshot();
-      else if (container.Message == MessageContainer.MessageType.SnapshotReady)
-        // must be async!
-        engines[container.JobId].GetSnapshot();
-    }        
+      switch (container.Message) {
+        case MessageContainer.MessageType.AbortJob:
+          engines[container.JobId].Abort();
+          break;
+        case MessageContainer.MessageType.JobAborted:
+          Debug.WriteLine("-- Job Aborted Message received");
+          break;
+        
+        
+        case MessageContainer.MessageType.RequestSnapshot:
+          engines[container.JobId].RequestSnapshot();
+          break;
+        case MessageContainer.MessageType.SnapshotReady:
+          engines[container.JobId].GetSnapshot();
+          break;
+        
+        
+        case MessageContainer.MessageType.FetchJob:
+          IJob job = CreateNewJob();
+          
+          AppDomain appDomain = CreateNewAppDomain(false);
+          appDomains.Add(job.JobId, appDomain);
+          
+          Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
+          engine.Job = job;
+          engine.JobId = job.JobId;
+          engine.Queue = MessageQueue.GetInstance();
+          engine.Start();
+          engines.Add(engine.JobId, engine);
+          break;
+
+        case MessageContainer.MessageType.FinishedJob:
+          engines[container.JobId].GetFinishedJob();
+          AppDomain.Unload(appDomains[container.JobId]);
+          appDomains.Remove(container.JobId);
+          engines.Remove(container.JobId);
+          break;
+
+      }
+    }
+    
+    /// <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;
+    }
   }
 }

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

@@ -32 +32 @@
   public class Executor: MarshalByRefObject {
     public long JobId { get; set; }
-    public TestJob Job { get; set; }
+    public IJob Job { get; set; }
     public MessageContainer.MessageType CurrentMessage { get; set; }
     public MessageQueue Queue { get; set; }
@@ -55 +55 @@
     }
 
-    public XmlNode GetSnapshot() {
+    public String GetSnapshot() {
       //if the job is still running, something went VERY bad.
       if (Job.Running) {
@@ -63 +63 @@
         CurrentMessage = MessageContainer.MessageType.NoMessage;
         // Pack the whole job inside an xml document
-        String job = SerializeJobObject();
-        XmlNode node = Job.GetXmlNode();        
+        String job = SerializeJobObject();        
         // Restart the job
         Job.Start();
         // Return the Snapshot
-        return node;
+        return job;
       }
     }
 
-    public XmlNode GetFinishedJob() {
+    public String GetFinishedJob() {
       //Job isn't finished!
       if (Job.Running) {
         return null;
       } else {
-        return Job.GetXmlNode();
+        return SerializeJobObject();
       }
     }