ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

break the top thingies

Browse Source
This commit is contained in:
UbitUmarov
2020-08-22 17:33:38 +01:00
parent 2f0d2db19d
commit 16ab72a223
5 changed files with 238 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -2411,7 +2411,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
foreach (IScriptInstance si in m_Scripts.Values)
{
if (!topScripts.ContainsKey(si.LocalID))
if (!topScripts.ContainsKey(si.RootLocalID))
topScripts[si.RootLocalID] = 0;
topScripts[si.RootLocalID] += GetExectionTime(si);
@@ -2511,9 +2511,34 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
}
public Dictionary<uint, int> GetObjectScriptsBytesUsed()
public ICollection<ScriptTopStatsData> GetTopObjectStats(float mintime, int minmemory, out float totaltime, out float totalmemory)
{
return new Dictionary<uint, int>();
Dictionary<uint, ScriptTopStatsData> topScripts = new Dictionary<uint, ScriptTopStatsData>();
totalmemory = 0;
totaltime = 0;
lock (m_Scripts)
{
foreach (IScriptInstance si in m_Scripts.Values)
{
float time = GetExectionTime(si);
totaltime += time;
if(time > mintime)
{
ScriptTopStatsData sd;
if (topScripts.TryGetValue(si.RootLocalID, out sd))
sd.time += time;
else
{
sd = new ScriptTopStatsData();
sd.localID = si.RootLocalID;
sd.time = time;
topScripts[si.RootLocalID] = sd;
}
}
}
}
return topScripts.Values;
}
}
}

37
OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
View File

@@ -1875,24 +1875,43 @@ namespace OpenSim.Region.ScriptEngine.Yengine
}
/**
* @brief Return a list of all script used bytes
* @brief Return a list of object script used bytes and time
*/
public Dictionary<uint, int> GetObjectScriptsBytesUsed()
public ICollection<ScriptTopStatsData> GetTopObjectStats(float mintime, int minmemory, out float totaltime, out float totalmemory)
{
Dictionary<uint, int> topScripts = new Dictionary<uint, int>();
Dictionary<uint, ScriptTopStatsData> topScripts = new Dictionary<uint, ScriptTopStatsData>();
totalmemory = 0;
totaltime = 0;
lock (m_InstancesDict)
{
foreach (XMRInstance instance in m_InstancesDict.Values)
{
uint rootLocalID = instance.m_Part.ParentGroup.LocalId;
int oldTotal;
if (!topScripts.TryGetValue(rootLocalID, out oldTotal))
oldTotal = 0;
topScripts[rootLocalID] = instance.xmrHeapUsed() + oldTotal;
float time = (float)instance.m_CPUTime;
totaltime += time;
int mem = instance.xmrHeapUsed();
totalmemory += mem;
if (time > mintime || mem > minmemory)
{
ScriptTopStatsData sd;
if (topScripts.TryGetValue(rootLocalID, out sd))
{
sd.time += time;
sd.memory += mem;
}
else
{
sd = new ScriptTopStatsData();
sd.localID = rootLocalID;
sd.time = time;
sd.memory = mem;
topScripts[rootLocalID] = sd;
}
}
}
}
return topScripts;
return topScripts.Values;
}
/**