Changeset 766 for trunk

Timestamp:

11/15/08 22:08:33 (16 years ago)

Author:

gkronber

Message:

fixed #362 (GridClient doesn't work since the change to use major.minor version-numbers for plugins)

Location:

trunk/sources

Files:

• HeuristicLab.Grid/EngineRunner.cs (modified) (1 diff)
• HeuristicLab.Grid/GridClient.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Grid/EngineRunner.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using System.Threading;
+using HeuristicLab.PluginInfrastructure;
+using System.Reflection;
 
 namespace HeuristicLab.Grid {

trunk/sources/HeuristicLab.Grid/GridClient.cs

@@ -26 +26 @@
 using System.Diagnostics;
 using System.Threading;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Grid {
@@ -134 +135 @@
         if(gotEngine && !stopped) {
           executing = true;
-          AppDomain engineDomain = AppDomain.CreateDomain("Engine domain", null, AppDomain.CurrentDomain.SetupInformation);
-          EngineRunner runner = (EngineRunner)engineDomain.CreateInstanceAndUnwrap("HeuristicLab.Grid", typeof(EngineRunner).FullName);
+          AppDomain engineDomain = PluginManager.Manager.CreateAndInitAppDomain("Engine domain");
+          Type engineRunnerType = typeof(EngineRunner);
+          
+          EngineRunner runner = (EngineRunner)engineDomain.CreateInstanceAndUnwrap(engineRunnerType.Assembly.GetName().Name, engineRunnerType.FullName);
           byte[] resultXml = runner.Execute(engineXml);
           bool success = false;

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -84 +84 @@
       pluginDomain = AppDomain.CreateDomain("plugin domain", null, setup);
       remoteLoader = (Loader)pluginDomain.CreateInstanceAndUnwrap("HeuristicLab.PluginInfraStructure", "HeuristicLab.PluginInfrastructure.Loader");
-      remoteLoader.PluginAction += delegate(object sender, PluginManagerActionEventArgs args) { if(Action != null) Action(this, args); };
+      remoteLoader.PluginAction += delegate(object sender, PluginManagerActionEventArgs args) { if (Action != null) Action(this, args); };
       remoteLoader.Init();
       NotifyListeners(PluginManagerAction.Initialized, "-");
@@ -100 +100 @@
 
       NotifyListeners(PluginManagerAction.Starting, appInfo.Name);
+      AppDomain applicationDomain = null;
+      try {
+        applicationDomain = CreateAndInitAppDomain(appInfo.Name + " AppDomain");
+        Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap(typeof(Runner).Assembly.GetName().Name, typeof(Runner).FullName);
+        remoteRunner.Run(appInfo);
+      }
+      finally {
+        // make sure domain is unloaded in all cases
+        if (applicationDomain != null) AppDomain.Unload(applicationDomain);
+      }
+    }
+
+    /// <summary>
+    /// Creates a new AppDomain with all plugins preloaded.
+    /// </summary>
+    /// <param name="friendlyName">Name of the new AppDomain</param>
+    /// <returns>the new AppDomain with all plugins preloaded.</returns>
+    public AppDomain CreateAndInitAppDomain(string friendlyName) {
       AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;
       setup.PrivateBinPath = pluginDir;
-      AppDomain applicationDomain = AppDomain.CreateDomain(appInfo.Name + " AppDomain", null, setup);
-      try {
-        Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap("HeuristicLab.PluginInfrastructure", "HeuristicLab.PluginInfrastructure.Runner");
-        NotifyListeners(PluginManagerAction.Initializing, "All plugins");
+      AppDomain applicationDomain = AppDomain.CreateDomain(friendlyName, null, setup);
+      Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap(typeof(Runner).Assembly.GetName().Name, typeof(Runner).FullName);
+      NotifyListeners(PluginManagerAction.Initializing, "All plugins");
+      if (remoteLoader != null) {
         remoteRunner.LoadPlugins(remoteLoader.ActivePlugins);
-        NotifyListeners(PluginManagerAction.Initialized, "All plugins");
-        remoteRunner.Run(appInfo);
-      } finally {
-        // make sure domain is unloaded in all cases
-        AppDomain.Unload(applicationDomain);
+      } else if (LoadedPlugins != null && LoadedPlugins.Count > 0) {
+        remoteRunner.LoadPlugins(LoadedPlugins);
       }
+      NotifyListeners(PluginManagerAction.Initialized, "All plugins");
+      return applicationDomain;
     }
+
 
     /// <summary>
@@ -122 +140 @@
     public List<PluginInfo> GetDependentPlugins(PluginInfo pluginInfo) {
       List<PluginInfo> mergedList = new List<PluginInfo>();
-      foreach(PluginInfo plugin in InstalledPlugins) {
-        if(plugin.Dependencies.Contains(pluginInfo)) {
-          if(!mergedList.Contains(plugin)) {
+      foreach (PluginInfo plugin in InstalledPlugins) {
+        if (plugin.Dependencies.Contains(pluginInfo)) {
+          if (!mergedList.Contains(plugin)) {
             mergedList.Add(plugin);
           }
@@ -130 +148 @@
           // make sure that only one entry for each plugin is added to the merged list
           GetDependentPlugins(plugin).ForEach(delegate(PluginInfo dependentPlugin) {
-            if(!mergedList.Contains(dependentPlugin)) {
+            if (!mergedList.Contains(dependentPlugin)) {
               mergedList.Add(dependentPlugin);
             }
@@ -164 +182 @@
 
     private void NotifyListeners(PluginManagerAction action, string text) {
-      if(Action != null) {
+      if (Action != null) {
         Action(this, new PluginManagerActionEventArgs(text, action));
       }