Melanie
|
e4659a83f1
|
Merge branch 'master' into careminster
|
2012-11-17 02:03:24 +00:00 |
|
Justin Clark-Casey (justincc)
|
cd088757e9
|
Add a first draft mechanism for the IncomingPacketsProcessedStat to show the delta over time.
The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
|
2012-11-16 04:36:22 +00:00 |
|
Melanie
|
6ce93b22d1
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
|
2012-10-12 19:05:06 +01:00 |
|
Justin Clark-Casey (justincc)
|
ab7b7c5d3d
|
Get Watchdog to log thread removal
|
2012-10-12 02:59:28 +01:00 |
|
Melanie
|
aee7a31bc3
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
|
2012-08-18 13:17:39 +01:00 |
|
Justin Clark-Casey (justincc)
|
e4e5237086
|
When reporting a thread timeout, create a copy of the info rather than passing the original ThreadWatchdogInfo structure.
This is to avoid the possibility of misleading reporting if a watchdog update outraces an alarm.
Should address any remaining issues from http://opensimulator.org/mantis/view.php?id=6012
|
2012-08-18 00:46:34 +01:00 |
|
Melanie
|
90ad98370a
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
2012-08-16 02:46:48 +01:00 |
|
Justin Clark-Casey (justincc)
|
5a1b6fdf06
|
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.
|
2012-08-15 22:43:32 +01:00 |
|
Melanie
|
771d79e83e
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
|
2012-07-28 00:39:36 +01:00 |
|
Justin Clark-Casey (justincc)
|
5aec0ff207
|
Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework
|
2012-07-25 23:27:00 +01:00 |
|