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.avinationmerge
parent
f04d51378f
commit
6e3c79f31e
|
@ -51,7 +51,7 @@ namespace OpenSim.Framework
|
||||||
public ThreadWatchdogInfo(Thread thread)
|
public ThreadWatchdogInfo(Thread thread)
|
||||||
{
|
{
|
||||||
Thread = thread;
|
Thread = thread;
|
||||||
LastTick = Environment.TickCount & Int32.MaxValue;
|
LastTick = Environment.TickCount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ namespace OpenSim.Framework
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (m_threads.TryGetValue(threadID, out threadInfo))
|
if (m_threads.TryGetValue(threadID, out threadInfo))
|
||||||
threadInfo.LastTick = Environment.TickCount & Int32.MaxValue;
|
threadInfo.LastTick = Environment.TickCount;
|
||||||
else
|
else
|
||||||
AddThread(new ThreadWatchdogInfo(Thread.CurrentThread));
|
AddThread(new ThreadWatchdogInfo(Thread.CurrentThread));
|
||||||
}
|
}
|
||||||
|
@ -160,7 +160,7 @@ namespace OpenSim.Framework
|
||||||
|
|
||||||
lock (m_threads)
|
lock (m_threads)
|
||||||
{
|
{
|
||||||
int now = Environment.TickCount & Int32.MaxValue;
|
int now = Environment.TickCount;
|
||||||
|
|
||||||
foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
|
foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue