diff options
author | Justin Clark-Casey (justincc) | 2012-08-15 22:43:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-15 22:43:32 +0100 |
commit | 5a1b6fdf0638e100f8246f4131dab9bb037d78cf (patch) | |
tree | 472fb6b617f422dc44217b41d8ace3be036fd909 /OpenSim/Region/Application | |
parent | adding ATTACH_*_PEC constants (diff) | |
download | opensim-SC_OLD-5a1b6fdf0638e100f8246f4131dab9bb037d78cf.zip opensim-SC_OLD-5a1b6fdf0638e100f8246f4131dab9bb037d78cf.tar.gz opensim-SC_OLD-5a1b6fdf0638e100f8246f4131dab9bb037d78cf.tar.bz2 opensim-SC_OLD-5a1b6fdf0638e100f8246f4131dab9bb037d78cf.tar.xz |
Don't enable the thread watchdog until all regions are ready.
This is to avoid false positives when the machine is under heavy load whilst starting up.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 37cfe1d..f784398 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -305,8 +305,13 @@ namespace OpenSim | |||
305 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 305 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |
306 | SceneManager.OnRestartSim += handleRestartRegion; | 306 | SceneManager.OnRestartSim += handleRestartRegion; |
307 | 307 | ||
308 | // Only start the memory watchdog once all regions are ready | 308 | // Only enable the watchdogs when all regions are ready. Otherwise we get false positives when cpu is |
309 | SceneManager.OnRegionsReadyStatusChange += sm => MemoryWatchdog.Enabled = sm.AllRegionsReady; | 309 | // heavily used during initial startup. |
310 | // | ||
311 | // FIXME: It's also possible that region ready status should be flipped during an OAR load since this | ||
312 | // also makes heavy use of the CPU. | ||
313 | SceneManager.OnRegionsReadyStatusChange | ||
314 | += sm => { MemoryWatchdog.Enabled = sm.AllRegionsReady; Watchdog.Enabled = sm.AllRegionsReady; }; | ||
310 | } | 315 | } |
311 | 316 | ||
312 | /// <summary> | 317 | /// <summary> |