From ac7ccdf7d77810aef0a3ad70f1504fdb111dc0aa Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 26 Oct 2009 14:41:27 -0700
Subject: * 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

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

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
                 float physicsFPS = 0;
 
                 frameMS = Environment.TickCount;
+
                 try
                 {
                     // Increment the frame counter
@@ -1152,6 +1153,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((maintc < (m_timespan * 1000)) && maintc > 0)
                     Thread.Sleep(maintc);
 
+                // Tell the watchdog that this thread is still alive
                 Watchdog.UpdateThread();
             }
         }
-- 
cgit v1.1