aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-31 21:09:26 +0000
committerJustin Clark-Casey (justincc)2012-01-31 21:09:26 +0000
commit1505c22995e411af0c7e29d0331cdf244d69fd4c (patch)
treee66f400684ba51d13f87728b4f274efe701ea998 /OpenSim/Framework/Servers
parentRemove scene object null check on SceneGraph.AddSceneObject(). Complain expl... (diff)
downloadopensim-SC_OLD-1505c22995e411af0c7e29d0331cdf244d69fd4c.zip
opensim-SC_OLD-1505c22995e411af0c7e29d0331cdf244d69fd4c.tar.gz
opensim-SC_OLD-1505c22995e411af0c7e29d0331cdf244d69fd4c.tar.bz2
opensim-SC_OLD-1505c22995e411af0c7e29d0331cdf244d69fd4c.tar.xz
Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound.
This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 4c381d0..545e76c 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Framework.Servers
251 251
252 sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine); 252 sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
253 253
254 int timeNow = Util.EnvironmentTickCount(); 254 int timeNow = Environment.TickCount & Int32.MaxValue;
255 255
256 sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE"); 256 sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE");
257 sb.Append(Environment.NewLine); 257 sb.Append(Environment.NewLine);