aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMike Rieker2010-08-03 20:09:00 +0000
committerMike Rieker2010-08-03 20:09:00 +0000
commit6e3c79f31e4a552ef81e73156d3f84cbcfbdb2cf (patch)
tree3bad50f85f95cc321153da11ed7f127cffc73ff5
parentDrop the RestClient timeout from 15 minutes to 30 seconds. This does not addr... (diff)
downloadopensim-SC-6e3c79f31e4a552ef81e73156d3f84cbcfbdb2cf.zip
opensim-SC-6e3c79f31e4a552ef81e73156d3f84cbcfbdb2cf.tar.gz
opensim-SC-6e3c79f31e4a552ef81e73156d3f84cbcfbdb2cf.tar.bz2
opensim-SC-6e3c79f31e4a552ef81e73156d3f84cbcfbdb2cf.tar.xz
don't mask current time reads (since we don't mask the corresponding subtract)
if you mask the reads you have to mask the subtract as well. simplest is just don't mask any of it.
-rw-r--r--OpenSim/Framework/Watchdog.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index 5d46905..bc19dd1 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework
51 public ThreadWatchdogInfo(Thread thread) 51 public ThreadWatchdogInfo(Thread thread)
52 { 52 {
53 Thread = thread; 53 Thread = thread;
54 LastTick = Environment.TickCount & Int32.MaxValue; 54 LastTick = Environment.TickCount;
55 } 55 }
56 } 56 }
57 57
@@ -143,7 +143,7 @@ namespace OpenSim.Framework
143 try 143 try
144 { 144 {
145 if (m_threads.TryGetValue(threadID, out threadInfo)) 145 if (m_threads.TryGetValue(threadID, out threadInfo))
146 threadInfo.LastTick = Environment.TickCount & Int32.MaxValue; 146 threadInfo.LastTick = Environment.TickCount;
147 else 147 else
148 AddThread(new ThreadWatchdogInfo(Thread.CurrentThread)); 148 AddThread(new ThreadWatchdogInfo(Thread.CurrentThread));
149 } 149 }
@@ -160,7 +160,7 @@ namespace OpenSim.Framework
160 160
161 lock (m_threads) 161 lock (m_threads)
162 { 162 {
163 int now = Environment.TickCount & Int32.MaxValue; 163 int now = Environment.TickCount;
164 164
165 foreach (ThreadWatchdogInfo threadInfo in m_threads.Values) 165 foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
166 { 166 {