Changeset 1936

Timestamp:

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

Author:

kgrading

Message:

switchback to dynamic loading (#653)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/Runner.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs

@@ -229 +229 @@
 
     private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
-      if (e.Error == null)
+      if (e.Error == null && e.Result.Success == true)
         SendHeartBeatCompleted(sender, e);
       else

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));      
     }
 

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

@@ -53 +53 @@
     public void Start(byte[] serializedJob) {
       CreationTime = DateTime.Now;
+      
       Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
       //debug

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -225 +225 @@
       setup.ApplicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;      
       AppDomain applicationDomain = AppDomain.CreateDomain(friendlyName, AppDomain.CurrentDomain.Evidence, setup, pset, CreateStrongName(Assembly.GetExecutingAssembly()));
-                      
       Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap(typeof(Runner).Assembly.GetName().Name, typeof(Runner).FullName);
       NotifyListeners(PluginManagerAction.Initializing, "All plugins");
 
-      //if (assemblyFiles != null && assemblyFiles.Count > 0)
-      //  remoteRunner.LoadPlugins(assemblyFiles);
+      if (assemblyFiles != null && assemblyFiles.Count > 0)
+        remoteRunner.LoadPlugins(assemblyFiles);
       
       //if (depPlugins != null && depPlugins.Count > 0) {        
-        remoteRunner.LoadPlugins(ActivePlugins);
+        //remoteRunner.LoadPlugins(ActivePlugins);
       //}
-      NotifyListeners(PluginManagerAction.Initialized, "All plugins");
+      NotifyListeners(PluginManagerAction.Initialized, "All plugins");    
       return applicationDomain;
     }

trunk/sources/HeuristicLab.PluginInfrastructure/Runner.cs

@@ -47 +47 @@
     /// <param name="plugins">bytearray of all plugins that should be loaded</param>
     public void LoadPlugins(ICollection<byte[]> plugins) {
-      foreach (byte[] plugin in plugins)
-        Assembly.Load(plugin);
+      foreach (byte[] plugin in plugins) {
+        Assembly.Load(plugin);        
+      }
     }