Move the health monitoring stuff where it will do some good

avinationmerge
Melanie 2012-03-21 00:00:32 +00:00
parent 80a3b43e69
commit 5233e335e9
1 changed files with 3 additions and 3 deletions

View File

@ -1232,9 +1232,6 @@ namespace OpenSim.Region.Framework.Scenes
while (!shuttingdown) while (!shuttingdown)
Update(-1); Update(-1);
m_lastUpdate = Util.EnvironmentTickCount();
m_firstHeartbeat = false;
} }
finally finally
{ {
@ -1441,6 +1438,9 @@ namespace OpenSim.Region.Framework.Scenes
if (maintc > 0) if (maintc > 0)
Thread.Sleep(maintc); Thread.Sleep(maintc);
m_lastUpdate = Util.EnvironmentTickCount();
m_firstHeartbeat = false;
// Optionally warn if a frame takes double the amount of time that it should. // Optionally warn if a frame takes double the amount of time that it should.
// if (Util.EnvironmentTickCountSubtract(m_lastFrameTick, previousFrameTick) > (int)(MinFrameTime * 1000 * 2)) // if (Util.EnvironmentTickCountSubtract(m_lastFrameTick, previousFrameTick) > (int)(MinFrameTime * 1000 * 2))
// m_log.WarnFormat( // m_log.WarnFormat(