diff options
author | UbitUmarov | 2019-04-15 23:32:22 +0100 |
---|---|---|
committer | UbitUmarov | 2019-04-15 23:32:22 +0100 |
commit | a83b7a292bc3c18c9c6a1aa17cfc2622b99804c4 (patch) | |
tree | 335491b0008480e334331b9e38ccb453a189bc46 /OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs | |
parent | update warp3d.dll (diff) | |
download | opensim-SC-a83b7a292bc3c18c9c6a1aa17cfc2622b99804c4.zip opensim-SC-a83b7a292bc3c18c9c6a1aa17cfc2622b99804c4.tar.gz opensim-SC-a83b7a292bc3c18c9c6a1aa17cfc2622b99804c4.tar.bz2 opensim-SC-a83b7a292bc3c18c9c6a1aa17cfc2622b99804c4.tar.xz |
mantis 8518: Yengine; we can't wait for GC (worse finalizers) to count released memory of some local variables, so add a pseudo free; fix memory account on timeslice rentry; change the folder for the debug IL files; fix memory usage on reset. This changes will only take effect on new compiles
Diffstat (limited to 'OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs index 75eae53..e92f429 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs | |||
@@ -2611,10 +2611,10 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
2611 | // everything required by any blocks it can branch to. | 2611 | // everything required by any blocks it can branch to. |
2612 | do | 2612 | do |
2613 | { | 2613 | { |
2614 | this.resolvedSomething = false; | 2614 | resolvedSomething = false; |
2615 | this.resolveSequence++; | 2615 | resolveSequence++; |
2616 | this.ResolveBlock((GraphNodeBlock)firstLin); | 2616 | ResolveBlock((GraphNodeBlock)firstLin); |
2617 | } while(this.resolvedSomething); | 2617 | } while(resolvedSomething); |
2618 | 2618 | ||
2619 | // Repeat the cutting loops as long as we keep finding stuff. | 2619 | // Repeat the cutting loops as long as we keep finding stuff. |
2620 | bool didSomething; | 2620 | bool didSomething; |
@@ -2939,7 +2939,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
2939 | return; | 2939 | return; |
2940 | 2940 | ||
2941 | // So we don't recurse forever on a backward branch. | 2941 | // So we don't recurse forever on a backward branch. |
2942 | currentBlock.hasBeenResolved = this.resolveSequence; | 2942 | currentBlock.hasBeenResolved = resolveSequence; |
2943 | 2943 | ||
2944 | // Assume we haven't written any locals yet. | 2944 | // Assume we haven't written any locals yet. |
2945 | List<ScriptMyLocal> localsWrittenSoFar = new List<ScriptMyLocal>(); | 2945 | List<ScriptMyLocal> localsWrittenSoFar = new List<ScriptMyLocal>(); |
@@ -2975,7 +2975,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
2975 | !currentBlock.localsReadBeforeWritten.Contains(readByNextBlock)) | 2975 | !currentBlock.localsReadBeforeWritten.Contains(readByNextBlock)) |
2976 | { | 2976 | { |
2977 | currentBlock.localsReadBeforeWritten.Add(readByNextBlock); | 2977 | currentBlock.localsReadBeforeWritten.Add(readByNextBlock); |
2978 | this.resolvedSomething = true; | 2978 | resolvedSomething = true; |
2979 | } | 2979 | } |
2980 | } | 2980 | } |
2981 | } | 2981 | } |