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

Make WebStatsModule properly handle scenes added or removed after initial startup. 

This may have been the cause of the DivByZero in http://opensimulator.org/mantis/view.php?id=6460
0.7.5-pf-bulletsim
Justin Clark-Casey (justincc) 2012-12-15 00:45:27 +00:00
parent 494e6a5f11
commit 1a262bdde7
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/UserStatistics/WebStatsModule.cs
View File

@ -94,8 +94,6 @@ namespace OpenSim.Region.UserStatistics
if (!enabled) if (!enabled)
return; return;
AddEventHandlers();
if (Util.IsWindows()) if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll"); Util.LoadArchSpecificWindowsDll("sqlite3.dll");
@ -143,10 +141,14 @@ namespace OpenSim.Region.UserStatistics
lock (m_scenes) lock (m_scenes)
{ {
m_scenes.Add(scene); m_scenes.Add(scene);
if (m_simstatsCounters.ContainsKey(scene.RegionInfo.RegionID)) updateLogMod = m_scenes.Count * 2;
m_simstatsCounters.Remove(scene.RegionInfo.RegionID);
m_simstatsCounters.Add(scene.RegionInfo.RegionID, new USimStatsData(scene.RegionInfo.RegionID)); m_simstatsCounters.Add(scene.RegionInfo.RegionID, new USimStatsData(scene.RegionInfo.RegionID));
scene.EventManager.OnRegisterCaps += OnRegisterCaps;
scene.EventManager.OnDeregisterCaps += OnDeRegisterCaps;
scene.EventManager.OnClientClosed += OnClientClosed;
scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
scene.StatsReporter.OnSendStatsResult += ReceiveClassicSimStatsPacket; scene.StatsReporter.OnSendStatsResult += ReceiveClassicSimStatsPacket;
} }
} }
@ -157,6 +159,15 @@ namespace OpenSim.Region.UserStatistics
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
if (!enabled)
return;
lock (m_scenes)
{
m_scenes.Remove(scene);
updateLogMod = m_scenes.Count * 2;
m_simstatsCounters.Remove(scene.RegionInfo.RegionID);
}
} }
public virtual void Close() public virtual void Close()
@ -187,9 +198,7 @@ namespace OpenSim.Region.UserStatistics
private void ReceiveClassicSimStatsPacket(SimStats stats) private void ReceiveClassicSimStatsPacket(SimStats stats)
{ {
if (!enabled) if (!enabled)
{
return; return;
}
try try
{ {
@ -198,10 +207,17 @@ namespace OpenSim.Region.UserStatistics
if (concurrencyCounter > 0 || System.Environment.TickCount - lastHit > 30000) if (concurrencyCounter > 0 || System.Environment.TickCount - lastHit > 30000)
return; return;
if ((updateLogCounter++ % updateLogMod) == 0) // We will conduct this under lock so that fields such as updateLogCounter do not potentially get
// confused if a scene is removed.
// XXX: Possibly the scope of this lock could be reduced though it's not critical.
lock (m_scenes)
{
if (updateLogMod != 0 && updateLogCounter++ % updateLogMod == 0)
{ {
m_loglines = readLogLines(10); m_loglines = readLogLines(10);
if (updateLogCounter > 10000) updateLogCounter = 1;
if (updateLogCounter > 10000)
updateLogCounter = 1;
} }
USimStatsData ss = m_simstatsCounters[stats.RegionUUID]; USimStatsData ss = m_simstatsCounters[stats.RegionUUID];
@ -211,6 +227,7 @@ namespace OpenSim.Region.UserStatistics
ss.ConsumeSimStats(stats); ss.ConsumeSimStats(stats);
} }
} }
}
catch (KeyNotFoundException) catch (KeyNotFoundException)
{ {
} }