Changeset 1031 for trunk/sources

Timestamp:

12/18/08 15:33:48 (16 years ago)

Author:

kgrading

Message:

implementation for #438

Location:

trunk/sources/HeuristicLab.Hive.Client.Core

Files:

• ConfigurationManager/ConfigManager.cs (modified) (1 diff)
• Core.cs (modified) (1 diff)
• Heartbeat.cs (modified) (1 diff)

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

@@ -96 +96 @@
       Dictionary<long, Executor> engines = Core.GetExecutionEngines();
       st.Jobs = new List<JobStatus>();
+
       foreach (KeyValuePair<long, Executor> kvp in engines) {
         Executor e = kvp.Value;

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

@@ -151 +151 @@
         AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(TestJob));
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-
-        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.Job.Id;
-        engine.Queue = MessageQueue.GetInstance();
-        engine.Start(e.Result.SerializedJob);
-        engines.Add(e.Result.Job.Id, engine);
-
-        ClientStatusInfo.JobsFetched++;
-
-        Debug.WriteLine("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
+        if (!jobs.ContainsKey(e.Result.Job.Id)) {
+          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.Job.Id;
+          engine.Queue = MessageQueue.GetInstance();
+          engine.Start(e.Result.SerializedJob);
+          engines.Add(e.Result.Job.Id, engine);
+
+          ClientStatusInfo.JobsFetched++;
+
+          Debug.WriteLine("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
+        }
       }
     }

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

@@ -71 +71 @@
     /// <param name="e"></param>
     void heartbeatTimer_Elapsed(object sender, ElapsedEventArgs e) {
-      Console.WriteLine("tick");
+      Console.WriteLine("tick");  
       ClientInfo info = ConfigManager.Instance.GetClientInfo();
       // Todo: remove tempfix for free cores.
+      // TODO: change jobProgress from int to Dictionary of Job and Double
       HeartBeatData heartBeatData = new HeartBeatData { ClientId = info.ClientId, 
                                                               freeCores = info.NrOfCores - (ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed),