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

Add locking around stats record fetch to resolve Mantis 7793.

LSLKeyTest
Robert Adams 2015-12-27 15:05:17 -08:00
parent e2517b51f8
commit 7831d219d7
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Framework/Monitoring/StatsManager.cs
View File

@ -262,33 +262,36 @@ namespace OpenSim.Framework.Monitoring
{ {
OSDMap map = new OSDMap(); OSDMap map = new OSDMap();
foreach (string catName in RegisteredStats.Keys) lock (RegisteredStats)
{ {
// Do this category if null spec, "all" subcommand or category name matches passed parameter. foreach (string catName in RegisteredStats.Keys)
// Skip category if none of the above.
if (!(String.IsNullOrEmpty(pCategoryName) || pCategoryName == AllSubCommand || pCategoryName == catName))
continue;
OSDMap contMap = new OSDMap();
foreach (string contName in RegisteredStats[catName].Keys)
{ {
if (!(string.IsNullOrEmpty(pContainerName) || pContainerName == AllSubCommand || pContainerName == contName)) // Do this category if null spec, "all" subcommand or category name matches passed parameter.
// Skip category if none of the above.
if (!(String.IsNullOrEmpty(pCategoryName) || pCategoryName == AllSubCommand || pCategoryName == catName))
continue; continue;
OSDMap statMap = new OSDMap();
SortedDictionary<string, Stat> theStats = RegisteredStats[catName][contName]; OSDMap contMap = new OSDMap();
foreach (string statName in theStats.Keys) foreach (string contName in RegisteredStats[catName].Keys)
{ {
if (!(String.IsNullOrEmpty(pStatName) || pStatName == AllSubCommand || pStatName == statName)) if (!(string.IsNullOrEmpty(pContainerName) || pContainerName == AllSubCommand || pContainerName == contName))
continue; continue;
OSDMap statMap = new OSDMap();
statMap.Add(statName, theStats[statName].ToBriefOSDMap()); SortedDictionary<string, Stat> theStats = RegisteredStats[catName][contName];
foreach (string statName in theStats.Keys)
{
if (!(String.IsNullOrEmpty(pStatName) || pStatName == AllSubCommand || pStatName == statName))
continue;
statMap.Add(statName, theStats[statName].ToBriefOSDMap());
}
contMap.Add(contName, statMap);
} }
map.Add(catName, contMap);
contMap.Add(contName, statMap);
} }
map.Add(catName, contMap);
} }
return map; return map;