ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing a thread, a dead thread, and a null Thread

Browse Source 
* Fix a null thread situation
This commit is contained in:
Teravus Ovares (Dan Olivares)
2009-08-13 22:12:37 -04:00
parent 7a761560c6
commit 0781ac9a5e
2 changed files with 216 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/Framework/ThreadTracker.cs
View File

@@ -77,12 +77,15 @@ namespace OpenSim.Framework
public static void Add(Thread thread)
{
#if DEBUG
lock (m_Threads)
if (thread != null)
{
ThreadTrackerItem tti = new ThreadTrackerItem();
tti.Thread = thread;
tti.LastSeenActive = DateTime.Now.Ticks;
m_Threads.Add(tti);
lock (m_Threads)
{
ThreadTrackerItem tti = new ThreadTrackerItem();
tti.Thread = thread;
tti.LastSeenActive = DateTime.Now.Ticks;
m_Threads.Add(tti);
}
}
#endif
}
@@ -107,16 +110,25 @@ namespace OpenSim.Framework
{
foreach (ThreadTrackerItem tti in new ArrayList(m_Threads))
{
if (tti.Thread.IsAlive)
try
{
// Its active
tti.LastSeenActive = DateTime.Now.Ticks;
if (tti.Thread.IsAlive)
{
// Its active
tti.LastSeenActive = DateTime.Now.Ticks;
}
else
{
// Its not active -- if its expired then remove it
if (tti.LastSeenActive + ThreadTimeout < DateTime.Now.Ticks)
m_Threads.Remove(tti);
}
}
else
catch (NullReferenceException)
{
// Its not active -- if its expired then remove it
if (tti.LastSeenActive + ThreadTimeout < DateTime.Now.Ticks)
m_Threads.Remove(tti);
m_Threads.Remove(tti);
}
}
}