diff options
| author | lbsa71 | 2008-03-18 13:39:29 +0000 |
|---|---|---|
| committer | lbsa71 | 2008-03-18 13:39:29 +0000 |
| commit | 9c428d993504afbda5d11dd644fe1694cc1aee95 (patch) | |
| tree | 7e4f2dd9f19cb11167e2819f463db3b016cc8654 | |
| parent | * Remove unused (and somewhat nonsensical) method in PhysicsActor (diff) | |
| download | opensim-SC-9c428d993504afbda5d11dd644fe1694cc1aee95.zip opensim-SC-9c428d993504afbda5d11dd644fe1694cc1aee95.tar.gz opensim-SC-9c428d993504afbda5d11dd644fe1694cc1aee95.tar.bz2 opensim-SC-9c428d993504afbda5d11dd644fe1694cc1aee95.tar.xz | |
* Applied Grumly57 patch for #781; Thanks, Grumly!
3 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs index 49f83c1..41100c9 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs | |||
| @@ -173,15 +173,15 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
| 173 | { | 173 | { |
| 174 | // Remove from internal list | 174 | // Remove from internal list |
| 175 | appDomains.Remove(ads); | 175 | appDomains.Remove(ads); |
| 176 | #if DEBUG | 176 | //#if DEBUG |
| 177 | Console.WriteLine("Found empty AppDomain, unloading"); | 177 | //Console.WriteLine("Found empty AppDomain, unloading"); |
| 178 | long m = GC.GetTotalMemory(true); | 178 | //long m = GC.GetTotalMemory(true); // This force a garbage collect that freezes some windows plateforms |
| 179 | #endif | 179 | //#endif |
| 180 | // Unload | 180 | // Unload |
| 181 | AppDomain.Unload(ads.CurrentAppDomain); | 181 | AppDomain.Unload(ads.CurrentAppDomain); |
| 182 | #if DEBUG | 182 | //#if DEBUG |
| 183 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain unload freed " + (m - GC.GetTotalMemory(true)) + " bytes of memory"); | 183 | //m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain unload freed " + (m - GC.GetTotalMemory(true)) + " bytes of memory"); |
| 184 | #endif | 184 | //#endif |
| 185 | } | 185 | } |
| 186 | } | 186 | } |
| 187 | } | 187 | } |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index f8b3152..4b086d8 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
| @@ -75,17 +75,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
| 75 | // Compile (We assume LSL) | 75 | // Compile (We assume LSL) |
| 76 | ScriptSource = LSLCompiler.PerformScriptCompile(Script); | 76 | ScriptSource = LSLCompiler.PerformScriptCompile(Script); |
| 77 | 77 | ||
| 78 | #if DEBUG | 78 | //#if DEBUG |
| 79 | long before; | 79 | //long before; |
| 80 | before = GC.GetTotalMemory(true); | 80 | //before = GC.GetTotalMemory(true); // This force a garbage collect that freezes some windows plateforms |
| 81 | #endif | 81 | //#endif |
| 82 | 82 | ||
| 83 | IScript CompiledScript; | 83 | IScript CompiledScript; |
| 84 | CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource); | 84 | CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource); |
| 85 | 85 | ||
| 86 | #if DEBUG | 86 | //#if DEBUG |
| 87 | m_scriptEngine.Log.DebugFormat("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); | 87 | //m_scriptEngine.Log.DebugFormat("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); |
| 88 | #endif | 88 | //#endif |
| 89 | 89 | ||
| 90 | CompiledScript.Source = Script; | 90 | CompiledScript.Source = Script; |
| 91 | // Add it to our script memstruct | 91 | // Add it to our script memstruct |
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs index 04cb0d2..a933b08 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs | |||
| @@ -70,17 +70,17 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine | |||
| 70 | // Compile (We assume LSL) | 70 | // Compile (We assume LSL) |
| 71 | //ScriptSource = LSLCompiler.CompileFromLSLText(Script); | 71 | //ScriptSource = LSLCompiler.CompileFromLSLText(Script); |
| 72 | 72 | ||
| 73 | #if DEBUG | 73 | //#if DEBUG |
| 74 | long before; | 74 | //long before; |
| 75 | before = GC.GetTotalMemory(true); | 75 | //before = GC.GetTotalMemory(true); // This force a garbage collect that freezes some windows plateforms |
| 76 | #endif | 76 | //#endif |
| 77 | 77 | ||
| 78 | IScript CompiledScript; | 78 | IScript CompiledScript; |
| 79 | CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource); | 79 | CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource); |
| 80 | 80 | ||
| 81 | #if DEBUG | 81 | //#if DEBUG |
| 82 | Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); | 82 | //Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); |
| 83 | #endif | 83 | //#endif |
| 84 | 84 | ||
| 85 | CompiledScript.Source = ScriptSource; | 85 | CompiledScript.Source = ScriptSource; |
| 86 | // Add it to our script memstruct | 86 | // Add it to our script memstruct |