Changeset 1990

Timestamp:

06/02/09 14:14:47 (16 years ago)

Author:

gkronber

Message:

• Refactoring: renamed method LoadPlugins to LoadAssemblies in class Runner.
• Added cache of loaded assemblies in the Runner.
• Added an AssemblyResolveEvent that returns already loaded assemblies from the cache.

#658 (For the execution of jobs assemblies have to be loaded dynamically in the correct order)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs (modified) (1 diff)
• HeuristicLab.Hive.Engine/3.2/HiveEngine.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/Runner.cs (modified) (2 diffs)

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

@@ -244 +244 @@
           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) {                    
@@ -265 +265 @@
       currentlyFetching = false;
     }
-    
 
     void wcfService_StoreFinishedJobResultCompleted(object sender, StoreFinishedJobResultCompletedEventArgs e) {

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.Hive.Engine/3.2/HiveEngine.cs

@@ -172 +172 @@
     public void Abort() {
       IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
-
-      //This are just Stubs on the server right now. There won't be any effect right now...
       executionEngineFacade.AbortJob(jobId);
       OnFinished();

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -229 +229 @@
 
       if (assemblyFiles != null && assemblyFiles.Count > 0)
-        remoteRunner.LoadPlugins(assemblyFiles);
+        remoteRunner.LoadAssemblies(assemblyFiles);
       
       //if (depPlugins != null && depPlugins.Count > 0) {        

trunk/sources/HeuristicLab.PluginInfrastructure/Runner.cs

@@ -30 +30 @@
   public class Runner : MarshalByRefObject {
 
+    private Dictionary<string, Assembly> loadedAssemblies;
+
+    public Runner() {
+      loadedAssemblies = new Dictionary<string, Assembly>();
+      AppDomain.CurrentDomain.AssemblyResolve += (sender, args) => {
+        if(loadedAssemblies.ContainsKey(args.Name)) {
+          return loadedAssemblies[args.Name];
+        }
+        return null;
+      };
+    }
+
     public void LoadPlugins(ICollection<PluginInfo> plugins) {
       //FileIOPermission fileperm = new FileIOPermission(FileIOPermissionAccess.AllAccess, @"C:\Program Files\HeuristicLab 3.0\plugins\");
@@ -43 +55 @@
     }
     /// <summary>
-    /// Loads plugins from a byte array
+    /// Loads assemblies from a byte array
     /// </summary>
-    /// <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);        
+    /// <param name="plugins">bytearray of all assemblies that should be loaded</param>
+    public void LoadAssemblies(ICollection<byte[]> assemblies) {
+      foreach (byte[] asm in assemblies) {
+        Assembly loadedAsm = Assembly.Load(asm);
+        RegisterLoadedAssembly(loadedAsm);
       }
+    }
+
+    private void RegisterLoadedAssembly(Assembly asm) {
+      loadedAssemblies.Add(asm.FullName, asm);
+      loadedAssemblies.Add(asm.GetName().Name, asm); // add short name
     }