aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-26 14:41:27 -0700
committerJohn Hurliman2009-10-26 14:41:27 -0700
commitac7ccdf7d77810aef0a3ad70f1504fdb111dc0aa (patch)
treee27db00548a86fbf370b481ab0848bd3d30f21aa /OpenSim/Region/Framework/Scenes/Scene.cs
parentChanged UseCircuitCode handling to be synchronous or asynchronous depending o... (diff)
downloadopensim-SC-ac7ccdf7d77810aef0a3ad70f1504fdb111dc0aa.zip
opensim-SC-ac7ccdf7d77810aef0a3ad70f1504fdb111dc0aa.tar.gz
opensim-SC-ac7ccdf7d77810aef0a3ad70f1504fdb111dc0aa.tar.bz2
opensim-SC-ac7ccdf7d77810aef0a3ad70f1504fdb111dc0aa.tar.xz
* Changed the watchdog timer to improve the speed of UpdateThread(), only track threads once the first call to UpdateThread() has been made, and allow re-tracking of threads that timed out but revived later
* Added a commented out call to Watchdog.UpdateThread() in OdeScene. If it turns out that loading a large OAR file or some other operation is timing out the heartbeat thread, we'll need to uncomment it
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f052c65..95d69a1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1025,6 +1025,7 @@ namespace OpenSim.Region.Framework.Scenes
1025 float physicsFPS = 0; 1025 float physicsFPS = 0;
1026 1026
1027 frameMS = Environment.TickCount; 1027 frameMS = Environment.TickCount;
1028
1028 try 1029 try
1029 { 1030 {
1030 // Increment the frame counter 1031 // Increment the frame counter
@@ -1152,6 +1153,7 @@ namespace OpenSim.Region.Framework.Scenes
1152 if ((maintc < (m_timespan * 1000)) && maintc > 0) 1153 if ((maintc < (m_timespan * 1000)) && maintc > 0)
1153 Thread.Sleep(maintc); 1154 Thread.Sleep(maintc);
1154 1155
1156 // Tell the watchdog that this thread is still alive
1155 Watchdog.UpdateThread(); 1157 Watchdog.UpdateThread();
1156 } 1158 }
1157 } 1159 }