OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ynegine: add some missing memory usage on script reset

0.9.1.0-post-fixes
UbitUmarov 2019-04-16 00:07:13 +01:00
parent a83b7a292b
commit 2fa5d10c00
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/ScriptEngine/YEngine/XMRInstAbstract.cs
View File

@ -86,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
public void Clear() public void Clear()
{ {
heapUse = 0; int newheapUse = 0;
if(iarArrays != null) if(iarArrays != null)
{ {
foreach(XMR_Array xa in iarArrays) foreach(XMR_Array xa in iarArrays)
@ -100,9 +100,19 @@ namespace OpenSim.Region.ScriptEngine.Yengine
iarObjects = new object[iarObjects.Length]; iarObjects = new object[iarObjects.Length];
if(iarStrings != null) if(iarStrings != null)
iarStrings = new string[iarStrings.Length]; iarStrings = new string[iarStrings.Length];
if (iarFloats != null)
newheapUse += iarFloats.Length * HeapTrackerObject.HT_DOUB;
if (iarIntegers != null)
newheapUse += iarIntegers.Length * HeapTrackerObject.HT_INT;
if (iarRotations != null)
newheapUse += iarRotations.Length * HeapTrackerObject.HT_ROT;
if (iarVectors != null)
newheapUse += iarVectors.Length * HeapTrackerObject.HT_VEC;
heapUse = instance.UpdateHeapUse(0, newheapUse);
} }
public void AllocVarArrays(XMRInstArSizes ars) public void AllocVarArrays(XMRInstArSizes ars)
{ {
ClearOldArrays(); ClearOldArrays();
int newuse = heapUse + int newuse = heapUse +
@ -204,7 +214,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// value types simply are the size of the value * number of values // value types simply are the size of the value * number of values
newheapuse += chrs.Length * HeapTrackerObject.HT_CHAR; newheapuse += chrs.Length * HeapTrackerObject.HT_CHAR;
newheapuse += flts.Length * HeapTrackerObject.HT_SFLT; newheapuse += flts.Length * HeapTrackerObject.HT_DOUB;
newheapuse += ints.Length * HeapTrackerObject.HT_INT; newheapuse += ints.Length * HeapTrackerObject.HT_INT;
newheapuse += rots.Length * HeapTrackerObject.HT_ROT; newheapuse += rots.Length * HeapTrackerObject.HT_ROT;
newheapuse += vecs.Length * HeapTrackerObject.HT_VEC; newheapuse += vecs.Length * HeapTrackerObject.HT_VEC;