From cacc02883526d6913be13d745215d7367708412e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 17 Nov 2011 21:03:08 +0000
Subject: If the entire simulator is shutting down then don't bother to unload
 the scripts from the appdomain in XEngine.

All the other actions (script state save, etc.) still occur.
This makes shutdown where there are many scripts vastly quicker.
---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/XEngine')

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 1c16c87..12e1a78 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -90,6 +90,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         private bool m_KillTimedOutScripts;
         private string m_ScriptEnginesPath = null;
 
+        /// <summary>
+        /// Is the entire simulator in the process of shutting down?
+        /// </summary>
+        private bool m_SimulatorShuttingDown;
+
         private static List<XEngine> m_ScriptEngines =
                 new List<XEngine>();
 
@@ -470,17 +475,22 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     //
                     instance.DestroyScriptInstance();
 
-                    // Unload scripts and app domains
+                    // Unload scripts and app domains.
                     // Must be done explicitly because they have infinite
-                    // lifetime
-                    //
-                    m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
-                    if (m_DomainScripts[instance.AppDomain].Count == 0)
+                    // lifetime.
+                    // However, don't bother to do this if the simulator is shutting
+                    // down since it takes a long time with many scripts.
+                    if (!m_SimulatorShuttingDown)
                     {
-                        m_DomainScripts.Remove(instance.AppDomain);
-                        UnloadAppDomain(instance.AppDomain);
+                        m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
+                        if (m_DomainScripts[instance.AppDomain].Count == 0)
+                        {
+                            m_DomainScripts.Remove(instance.AppDomain);
+                            UnloadAppDomain(instance.AppDomain);
+                        }
                     }
                 }
+
                 m_Scripts.Clear();
                 m_PrimObjects.Clear();
                 m_Assemblies.Clear();
@@ -1428,6 +1438,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void OnShutdown()
         {
+            m_SimulatorShuttingDown = true;
+
             List<IScriptInstance> instances = new List<IScriptInstance>();
 
             lock (m_Scripts)
-- 
cgit v1.1