1 files changed, 115 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
new file mode 100644
index 0000000..1e20547
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.Threading;
+using System.Runtime.Remoting;
+using System.IO;
+namespace OpenSim.Region.ScriptEngine.DotNetEngine
+{
+    public class AppDomainManager
+    {
+        private int MaxScriptsPerAppDomain = 10;
+        private List<AppDomainStructure> AppDomains = new List<AppDomainStructure>();
+        private struct AppDomainStructure
+        {
+            /// <summary>
+            /// The AppDomain itself
+            /// </summary>
+            public AppDomain CurrentAppDomain;
+            /// <summary>
+            /// Number of scripts loaded into AppDomain
+            /// </summary>
+            public int ScriptsLoaded;
+            /// <summary>
+            /// Number of dead scripts
+            /// </summary>
+            public int ScriptsWaitingUnload;
+        }
+        private AppDomainStructure CurrentAD;
+        private object GetLock = new object();
+                private ScriptEngine m_scriptEngine;
+        public AppDomainManager(ScriptEngine scriptEngine)
+        {
+            m_scriptEngine = scriptEngine;
+        }
+        internal AppDomain GetFreeAppDomain()
+        {
+            lock(GetLock) {
+                // No current or current full?
+                if (CurrentAD.CurrentAppDomain == null || CurrentAD.ScriptsLoaded >= MaxScriptsPerAppDomain)
+                {
+                    // Create a new current AppDomain
+                    CurrentAD = new AppDomainStructure();
+                    CurrentAD.ScriptsWaitingUnload = 0; // to avoid compile warning for not in use
+                    CurrentAD.CurrentAppDomain = PrepareNewAppDomain();
+                    AppDomains.Add(CurrentAD);
+                }
+                // Increase number of scripts loaded
+                CurrentAD.ScriptsLoaded++;
+                // Return AppDomain
+                return CurrentAD.CurrentAppDomain;
+            } // lock
+        }
+        private int AppDomainNameCount;
+        private AppDomain PrepareNewAppDomain()
+        {
+            // Create and prepare a new AppDomain
+            AppDomainNameCount++;
+            // TODO: Currently security and configuration match current appdomain
+            // Construct and initialize settings for a second AppDomain.
+            AppDomainSetup ads = new AppDomainSetup();
+            ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory;
+                //Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
+            //ads.ApplicationName = "DotNetScriptEngine";
+            //ads.DynamicBase = ads.ApplicationBase;
+            
+            Console.WriteLine("AppDomain BaseDirectory: " + ads.ApplicationBase);
+            ads.DisallowBindingRedirects = false;
+            ads.DisallowCodeDownload = true;
+            ads.ShadowCopyFiles = "true";
+            
+            ads.ConfigurationFile =
+                AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
+            AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads);
+            foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                //Console.WriteLine("Loading: " + a.GetName(true));
+                try
+                {
+                    AD.Load(a.GetName(true));
+                    
+                }
+                catch (Exception e)
+                {
+                    //Console.WriteLine("FAILED load");
+                }
+                
+            }
+            Console.WriteLine("Assembly file: " + this.GetType().Assembly.CodeBase);
+            Console.WriteLine("Assembly name: " + this.GetType().ToString());
+            //AD.CreateInstanceFrom(this.GetType().Assembly.CodeBase, "OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine");
+            //AD.Load(this.GetType().Assembly.CodeBase);
+            Console.WriteLine("Done preparing new appdomain.");
+            return AD;
+        }
+        public class NOOP : MarshalByRefType
+        {
+            public NOOP() {
+            }
+        }
+    }
+}

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs new file mode 100644 index 0000000..1e20547 --- /dev/null +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
@@ -0,0 +1,115 @@
	1	using System;
	2	using System.Collections.Generic;
	3	using System.Text;
	4	using System.Reflection;
	5	using System.Threading;
	6	using System.Runtime.Remoting;
	7	using System.IO;
	8
	9	namespace OpenSim.Region.ScriptEngine.DotNetEngine
	10	{
	11	public class AppDomainManager
	12	{
	13	private int MaxScriptsPerAppDomain = 10;
	14	private List<AppDomainStructure> AppDomains = new List<AppDomainStructure>();
	15	private struct AppDomainStructure
	16	{
	17	/// <summary>
	18	/// The AppDomain itself
	19	/// </summary>
	20	public AppDomain CurrentAppDomain;
	21	/// <summary>
	22	/// Number of scripts loaded into AppDomain
	23	/// </summary>
	24	public int ScriptsLoaded;
	25	/// <summary>
	26	/// Number of dead scripts
	27	/// </summary>
	28	public int ScriptsWaitingUnload;
	29	}
	30	private AppDomainStructure CurrentAD;
	31	private object GetLock = new object();
	32
	33	private ScriptEngine m_scriptEngine;
	34	public AppDomainManager(ScriptEngine scriptEngine)
	35	{
	36	m_scriptEngine = scriptEngine;
	37	}
	38
	39	internal AppDomain GetFreeAppDomain()
	40	{
	41	lock(GetLock) {
	42	// No current or current full?
	43	if (CurrentAD.CurrentAppDomain == null \|\| CurrentAD.ScriptsLoaded >= MaxScriptsPerAppDomain)
	44	{
	45	// Create a new current AppDomain
	46	CurrentAD = new AppDomainStructure();
	47	CurrentAD.ScriptsWaitingUnload = 0; // to avoid compile warning for not in use
	48	CurrentAD.CurrentAppDomain = PrepareNewAppDomain();
	49	AppDomains.Add(CurrentAD);
	50
	51	}
	52
	53	// Increase number of scripts loaded
	54	CurrentAD.ScriptsLoaded++;
	55	// Return AppDomain
	56	return CurrentAD.CurrentAppDomain;
	57	} // lock
	58	}
	59
	60	private int AppDomainNameCount;
	61	private AppDomain PrepareNewAppDomain()
	62	{
	63	// Create and prepare a new AppDomain
	64	AppDomainNameCount++;
	65	// TODO: Currently security and configuration match current appdomain
	66
	67	// Construct and initialize settings for a second AppDomain.
	68	AppDomainSetup ads = new AppDomainSetup();
	69	ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory;
	70	//Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
	71	//ads.ApplicationName = "DotNetScriptEngine";
	72	//ads.DynamicBase = ads.ApplicationBase;
	73
	74	Console.WriteLine("AppDomain BaseDirectory: " + ads.ApplicationBase);
	75	ads.DisallowBindingRedirects = false;
	76	ads.DisallowCodeDownload = true;
	77	ads.ShadowCopyFiles = "true";
	78
	79	ads.ConfigurationFile =
	80	AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
	81
	82	AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads);
	83	foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies())
	84	{
	85	//Console.WriteLine("Loading: " + a.GetName(true));
	86	try
	87	{
	88	AD.Load(a.GetName(true));
	89
	90	}
	91	catch (Exception e)
	92	{
	93	//Console.WriteLine("FAILED load");
	94	}
	95
	96	}
	97
	98	Console.WriteLine("Assembly file: " + this.GetType().Assembly.CodeBase);
	99	Console.WriteLine("Assembly name: " + this.GetType().ToString());
	100	//AD.CreateInstanceFrom(this.GetType().Assembly.CodeBase, "OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine");
	101
	102	//AD.Load(this.GetType().Assembly.CodeBase);
	103
	104	Console.WriteLine("Done preparing new appdomain.");
	105	return AD;
	106
	107	}
	108
	109	public class NOOP : MarshalByRefType
	110	{
	111	public NOOP() {
	112	}
	113	}
	114	}
	115	}