Changeset 960

Timestamp:

12/11/08 15:14:02 (16 years ago)

Author:

kgrading

Message:

fixed fetchjobcompleted and sendheartbeat method (#430)

Location:

trunk/sources/HeuristicLab.Hive.Client.Core

Files:

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

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

@@ -144 +144 @@
 
     void wcfService_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
-      bool sandboxed = false;
+      if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
+        bool sandboxed = false;
 
-      PluginManager.Manager.Initialize();
-      AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed, typeof(TestJob));
-      
-      appDomains.Add(e.Result.JobId, appDomain);
+        PluginManager.Manager.Initialize();
+        AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed, typeof(TestJob));      
+        appDomains.Add(e.Result.JobId, appDomain);
 
-      Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-      engine.JobId = e.Result.JobId;
-      engine.Queue = MessageQueue.GetInstance();
-      engine.Start(e.Result.SerializedJob);
-      engines.Add(e.Result.JobId, engine);
+        Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
+        engine.JobId = e.Result.JobId;
+        engine.Queue = MessageQueue.GetInstance();
+        engine.Start(e.Result.SerializedJob);
+        engines.Add(e.Result.JobId, engine);
 
-      ClientStatusInfo.JobsFetched++;
+        ClientStatusInfo.JobsFetched++;
 
-      Debug.WriteLine("Increment FetchedJobs to:"+ClientStatusInfo.JobsFetched);
+        Debug.WriteLine("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
+      }
     }
 

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

@@ -72 +72 @@
       Console.WriteLine("tick");
       ClientInfo info = ConfigManager.Instance.GetClientInfo();
+      // Todo: remove tempfix for free cores.
       HeartBeatData heartBeatData = new HeartBeatData { ClientId = info.ClientId, 
-                                                              freeCores = info.NrOfCores, 
+                                                              freeCores = info.NrOfCores - (ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed), 
                                                               freeMemory = 1000, 
                                                               jobProgress = ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed};