Changeset 798

Timestamp:

11/20/08 17:09:21 (16 years ago)

Author:

whackl

Message:

implemented serveral services (#376)

Location:

trunk/sources/HeuristicLab.Hive.Client.Core

Files:

• Core.cs (modified) (6 diffs)
• Heartbeat.cs (modified) (1 diff)

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

@@ -61 +61 @@
     }
 
+    private ClientCommunicatorClient clientCommunicator;
+
     public void Start() {
       Heartbeat beat = new Heartbeat { Interval = 5000 };
@@ -67 +69 @@
       ClientInfo clientInfo = new ClientInfo { ClientId = Guid.NewGuid() };
 
-      ClientCommunicatorClient clientCommunicator = ServiceLocator.GetClientCommunicator();
+      clientCommunicator = ServiceLocator.GetClientCommunicator();
       clientCommunicator.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(ClientCommunicator_LoginCompleted);
       clientCommunicator.LoginAsync(clientInfo);
 
       MessageQueue queue = MessageQueue.GetInstance();
-      queue.AddMessage(MessageContainer.MessageType.FetchJob);
       while (true) {
         MessageContainer container = queue.GetMessage();
@@ -81 +82 @@
     }
 
-    void ClientCommunicator_LoginCompleted(object sender, LoginCompletedEventArgs e) {     
+    void ClientCommunicator_LoginCompleted(object sender, LoginCompletedEventArgs e) {
       if (e.Result.Success) {
         Logging.GetInstance().Info(this.ToString(), "Login completed to Hive Server @ " + DateTime.Now);
@@ -115 +116 @@
           break;
 
-
         case MessageContainer.MessageType.RequestSnapshot:
           engines[container.JobId].RequestSnapshot();
@@ -125 +125 @@
 
         case MessageContainer.MessageType.FetchJob:
-          bool sandboxed = true;
-
-          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);
+          clientCommunicator.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(ClientCommunicator_PullJobCompleted);
+          clientCommunicator.PullJobAsync(Guid.NewGuid());
           break;
 
@@ -145 +134 @@
           appDomains.Remove(container.JobId);
           engines.Remove(container.JobId);
+          Status.CurrentJobs--;
+          Debug.WriteLine("Decrement CurrentJobs to:"+Status.CurrentJobs.ToString());
           break;
+      }
+    }
 
-      }
+    void ClientCommunicator_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
+      bool sandboxed = false;
+
+      IJob job = new TestJob { JobId = e.Result.JobId };
+
+      AppDomain appDomain = CreateNewAppDomain(sandboxed);
+      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);
+
+      Status.CurrentJobs++;
+
+      Debug.WriteLine("Increment CurrentJobs to:"+Status.CurrentJobs.ToString());
     }
 

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

@@ -78 +78 @@
 
     void ClientCommunicator_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
-      System.Diagnostics.Debug.WriteLine("Heartbeat received! " + e.Result.ActionRequest.ToString());
-      foreach (MessageContainer mc in e.Result.ActionRequest) {
-        MessageQueue.GetInstance().AddMessage(mc);
-
-      }
+      System.Diagnostics.Debug.WriteLine("Heartbeat received! ");
+      e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
     }
   }