Changeset 1936 for trunk/sources/HeuristicLab.Hive.Client.Core

Timestamp:

05/28/09 17:26:51 (15 years ago)

Author:

kgrading

Message:

switchback to dynamic loading (#653)

Location:

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

Files:

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

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

@@ -239 +239 @@
         //Todo: make a set & override the equals method
         List<byte[]> files = new List<byte[]>();
-        //foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
-        //  files.AddRange(plugininfo.PluginFiles);
+        foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
+          files.AddRange(plugininfo.PluginFiles);
         
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);        
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
         lock (engines) {                    
@@ -251 +251 @@
             Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
             engine.JobId = e.Result.Job.Id;
-            engine.Queue = MessageQueue.GetInstance();
+            engine.Queue = MessageQueue.GetInstance();            
             engine.Start(e.Result.Job.SerializedJob);
             engines.Add(e.Result.Job.Id, engine);
@@ -333 +333 @@
 
     void appDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
-      Logging.Instance.Error(this.ToString(), "Exception in AppDomain: " + e.ExceptionObject.ToString());
-      
-    }
-
-    internal Dictionary<Guid, Job> GetJobs() {
+      Logging.Instance.Error(this.ToString(), "Exception in AppDomain: " + e.ExceptionObject.ToString());      
+    }
+
+    internal Dictionary<Guid, Job> GetJobs() {           
       return jobs;
     }

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

@@ -95 +95 @@
     void wcfService_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
       System.Diagnostics.Debug.WriteLine("Heartbeat received! ");
-      e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
+      e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));      
     }