diff options
| author | Melanie | 2012-08-15 22:59:31 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-15 22:59:31 +0100 |
| commit | e286a95d761334bb5781638d3bb16338a8343c71 (patch) | |
| tree | 6d854f59efb4b4922654d03329c07eb7476e1cce /OpenSim/Region/Application | |
| parent | Implementing PRIM_LINK_TARGET in a non-recursive fashion (diff) | |
| parent | Don't enable the thread watchdog until all regions are ready. (diff) | |
| download | opensim-SC_OLD-e286a95d761334bb5781638d3bb16338a8343c71.zip opensim-SC_OLD-e286a95d761334bb5781638d3bb16338a8343c71.tar.gz opensim-SC_OLD-e286a95d761334bb5781638d3bb16338a8343c71.tar.bz2 opensim-SC_OLD-e286a95d761334bb5781638d3bb16338a8343c71.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
| -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> |