Changeset 638 for branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure

Timestamp:

10/08/08 22:54:02 (16 years ago)

Author:

gkronber

Message:

created a branch for changes needed to run HL3 on Mono 2.0
(ticket #298)

Location:

branches/HL-3.2-MonoMigration

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.PluginInfrastructure/ApplicationInfo.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/BaseClasses/ApplicationBase.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/ClassInfoAttribute.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/DiscoveryService.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/InvalidPluginException.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/Loader.cs (modified) (5 diffs)
• HeuristicLab.PluginInfrastructure/PluginFileAttribute.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (5 diffs)
• HeuristicLab.PluginInfrastructure/Runner.cs (modified) (2 diffs)

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/ApplicationInfo.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Runtime.Serialization;
 
 namespace HeuristicLab.PluginInfrastructure {
@@ -69 +70 @@
       set { pluginType = value; }
     }
+
+    public override string ToString() {
+      return Name + " " + Version + " " + Description + " " + pluginAssembly + " " + pluginType;
+    }
   }
 }

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/BaseClasses/ApplicationBase.cs

@@ -34 +34 @@
     public ApplicationBase() {
       ReadAttributes();
+      Run();
     }
 

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/ClassInfoAttribute.cs

@@ -59 +59 @@
 
     public ClassInfoAttribute() {}
+
+    public ClassInfoAttribute(string name) {
+      Name = name;
+    }
   }
 }

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/DiscoveryService.cs

@@ -33 +33 @@
     public PluginInfo[] Plugins {
       get {
-        PluginInfo[] plugins = new PluginInfo[PluginManager.Manager.LoadedPlugins.Count];
-        PluginManager.Manager.LoadedPlugins.CopyTo(plugins, 0);
-        return plugins;
+        try {
+          PluginInfo[] plugins = new PluginInfo[PluginManager.Manager.LoadedPlugins.Count];
+          PluginManager.Manager.LoadedPlugins.CopyTo(plugins, 0);
+          return plugins;
+        } catch(Exception ex) {
+          Console.WriteLine(ex);
+          return new PluginInfo[] { };
+        }
       }
     }

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/InvalidPluginException.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Runtime.Serialization;
 
 namespace HeuristicLab.PluginInfrastructure {
+  [Serializable]
   class InvalidPluginException : Exception {
+    public InvalidPluginException() : base() { }
+
+    public InvalidPluginException(SerializationInfo info, StreamingContext context) : base(info, context) { }
   }
 }

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/Loader.cs

@@ -98 +98 @@
           return null;
         }
-        };
+      };
       allPlugins.Clear();
       disabledPlugins.Clear();
@@ -161 +161 @@
             }
           }
+        } catch(InvalidPluginException ex) {
+          PluginInfo info = new PluginInfo();
+          AssemblyName name = assembly.GetName();
+          info.Name = name.Name;
+          info.Version = name.Version;
+          info.Assemblies.Add(assembly.FullName);
+          info.Files.Add(assembly.Location);
+          info.Message = "Plugin doesn't have necessary meta-information: ";
+          disabledPlugins.Add(info);
         } catch(FileNotFoundException ex) {
           PluginInfo info = new PluginInfo();
@@ -198 +207 @@
       // iterate through all custom attributes and search for named arguments that we are interested in 
       foreach(CustomAttributeData attributeData in attributes) {
-        List<CustomAttributeNamedArgument> namedArguments = new List<CustomAttributeNamedArgument>(attributeData.NamedArguments);
-        // if the current attribute contains a named argument with the name "Name" then extract the plugin name
-        CustomAttributeNamedArgument pluginNameArgument = namedArguments.Find(delegate(CustomAttributeNamedArgument arg) {
-          return arg.MemberInfo.Name == "Name";
-        });
-        if(pluginNameArgument.MemberInfo != null) {
-          pluginName = (string)pluginNameArgument.TypedValue.Value;
-        }
-        // if the current attribute contains a named argument with the name "Dependency" then extract the dependency
-        // and store it in the list of all dependencies
-        CustomAttributeNamedArgument dependencyNameArgument = namedArguments.Find(delegate(CustomAttributeNamedArgument arg) {
-          return arg.MemberInfo.Name == "Dependency";
-        });
-        if(dependencyNameArgument.MemberInfo != null) {
-          pluginDependencies.Add((string)dependencyNameArgument.TypedValue.Value);
-        }
-        // if the current attribute has a named argument "Filename" then find if the argument "Filetype" is also supplied
-        // and if the filetype is Assembly then store the name of the assembly in the list of assemblies
-        CustomAttributeNamedArgument filenameArg = namedArguments.Find(delegate(CustomAttributeNamedArgument arg) {
-          return arg.MemberInfo.Name == "Filename";
-        });
-        CustomAttributeNamedArgument filetypeArg = namedArguments.Find(delegate(CustomAttributeNamedArgument arg) {
-          return arg.MemberInfo.Name == "Filetype";
-        });
+        CustomAttributeNamedArgument filenameArg;
+        CustomAttributeNamedArgument filetypeArg;
+        foreach(CustomAttributeNamedArgument arg in attributeData.NamedArguments) {
+          if(arg.MemberInfo.Name == "Name") {
+            // if the current attribute contains a named argument with the name "Name" then extract the plugin name
+            pluginName = (string)arg.TypedValue.Value;
+          } else if(arg.MemberInfo.Name == "Dependency") {
+            // if the current attribute contains a named argument with the name "Dependency" then extract the dependency
+            // and store it in the list of all dependencies
+            pluginDependencies.Add((string)arg.TypedValue.Value);
+          } else if(arg.MemberInfo.Name == "Filename") {
+            // if the current attribute has a named argument "Filename" then find if the argument "Filetype" is also supplied
+            // and if the filetype is Assembly then store the name of the assembly in the list of assemblies
+            filenameArg = arg;
+          } else if(arg.MemberInfo.Name == "Filetype") {
+            filetypeArg = arg;
+          }
+        }
         if(filenameArg.MemberInfo != null && filetypeArg.MemberInfo != null) {
           pluginFiles.Add(pluginDir + "/" + (string)filenameArg.TypedValue.Value);
@@ -229 +232 @@
         }
       }
-
       // minimal sanity check of the attribute values
       if(pluginName != "" && pluginAssemblies.Count > 0) {
@@ -393 +395 @@
     internal void OnDelete(PluginInfo pluginInfo) {
       IPlugin plugin = FindPlugin(pluginInfo);
-      if(plugin!=null) plugin.OnDelete();
+      if(plugin != null) plugin.OnDelete();
     }
 

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/PluginFileAttribute.cs

@@ -49 +49 @@
 
     public PluginFileAttribute() { }
+    public PluginFileAttribute(string name, PluginFileType type) {
+      this.Filename = name;
+      this.Filetype = type;
+    }
   }
 }

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -27 +27 @@
   // must extend MarshalByRefObject because of event passing between Loader and PluginManager (each in it's own AppDomain)
   public class PluginManager : MarshalByRefObject {
-
     // singleton: only one manager allowed in each AppDomain
-    private static PluginManager manager = new PluginManager();
+    private static readonly PluginManager manager = PluginManager.manager==null?new PluginManager():PluginManager.manager;
+    static PluginManager() { Console.WriteLine("static ctor called "); }
     public static PluginManager Manager {
-      get { return manager; }
+      get {
+        return manager;
+      }
     }
 
-    // singleton: only one control manager allowed in each applicatoin (i.e. AppDomain)
+    // singleton: only one control manager allowed in each application (i.e. AppDomain)
     private static IControlManager controlManager;
     public static IControlManager ControlManager {
@@ -71 +73 @@
     private ICollection<PluginInfo> loadedPlugins;
     public ICollection<PluginInfo> LoadedPlugins {
-      get { return loadedPlugins; }
-      internal set { loadedPlugins = value; }
+      get {
+        Console.WriteLine(AppDomain.CurrentDomain.Id);
+        Console.WriteLine(this.GetHashCode());
+        if(loadedPlugins != null) Console.WriteLine(loadedPlugins.Count); else Console.WriteLine("Loaded plugins==null!");
+        return loadedPlugins;
+      }
+      internal set {
+        Console.WriteLine(AppDomain.CurrentDomain.Id);
+        Console.WriteLine(value.Count);
+        Console.WriteLine(this.GetHashCode());
+        loadedPlugins = new List<PluginInfo>(value);
+      }
     }
 
@@ -82 +94 @@
       AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;
       setup.PrivateBinPath = pluginDir;
-      pluginDomain = AppDomain.CreateDomain("plugin domain", null, setup);
+      pluginDomain = AppDomain.CreateDomain("plugin domain");
+      pluginDomain.SetupInformation.PrivateBinPath = pluginDir;
       remoteLoader = (Loader)pluginDomain.CreateInstanceAndUnwrap("HeuristicLab.PluginInfraStructure", "HeuristicLab.PluginInfrastructure.Loader");
-      remoteLoader.PluginAction += delegate(object sender, PluginManagerActionEventArgs args) { if(Action != null) Action(this, args); };
+      remoteLoader.PluginAction += new PluginManagerActionEventHandler(remoteLoader_PluginAction);
       remoteLoader.Init();
       NotifyListeners(PluginManagerAction.Initialized, "-");
+    }
+
+    public void remoteLoader_PluginAction(object sender, PluginManagerActionEventArgs e) {
+      if(Action != null) Action(this, e);
     }
 
@@ -98 +115 @@
       // activate a PluginRunner instance in the application
       // and remotely tell it to start the application
-
+      Console.WriteLine(appInfo);
       NotifyListeners(PluginManagerAction.Starting, appInfo.Name);
       AppDomainSetup setup = AppDomain.CurrentDomain.SetupInformation;
       setup.PrivateBinPath = pluginDir;
-      AppDomain applicationDomain = AppDomain.CreateDomain(appInfo.Name + " AppDomain", null, setup);
+      AppDomain applicationDomain = AppDomain.CreateDomain(appInfo.Name + " AppDomain");
+      applicationDomain.SetupInformation.PrivateBinPath = pluginDir;
       try {
         Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap("HeuristicLab.PluginInfrastructure", "HeuristicLab.PluginInfrastructure.Runner");
@@ -108 +126 @@
         remoteRunner.LoadPlugins(remoteLoader.ActivePlugins);
         NotifyListeners(PluginManagerAction.Initialized, "All plugins");
-        remoteRunner.Run(appInfo);
+        remoteRunner.Run(appInfo.PluginAssembly, appInfo.PluginType);
       } finally {
         // make sure domain is unloaded in all cases

branches/HL-3.2-MonoMigration/HeuristicLab.PluginInfrastructure/Runner.cs

@@ -24 +24 @@
 using System.Text;
 using System.Reflection;
+using System.Runtime.Remoting;
+using System.Runtime.Serialization;
 
 namespace HeuristicLab.PluginInfrastructure {
@@ -29 +31 @@
 
     public void LoadPlugins(ICollection<PluginInfo> plugins) {
+      List<string> loadedNames = new List<string>();
       foreach(PluginInfo pluginInfo in plugins) {
         foreach(string assemblyName in pluginInfo.Assemblies) {
-          Assembly.LoadFrom(assemblyName);
+          if(!loadedNames.Contains(assemblyName)) {
+            Console.WriteLine("Loading assembly " + assemblyName);
+            loadedNames.Add(assemblyName);
+            Assembly.LoadFrom(assemblyName);
+          }
         }
       }
+      Console.WriteLine(AppDomain.CurrentDomain.Id);
       PluginManager.Manager.LoadedPlugins = plugins;
     }
 
-    public void Run(ApplicationInfo appInfo) {
-      IApplication runnablePlugin = (IApplication)Activator.CreateInstance(appInfo.PluginAssembly, appInfo.PluginType).Unwrap();
-      runnablePlugin.Run();
+    public void Run(string assembly, string type) {
+      Console.WriteLine(AppDomain.CurrentDomain.Id);
+      object proxy = AppDomain.CurrentDomain.CreateInstanceAndUnwrap(assembly, type);
     }