Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c.

Also adds these to the watchdogs with very large timeouts (should really be infinite)
0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-10-25 23:26:21 +01:00
parent e1e0f20c7f
commit 05dff4987b
2 changed files with 11 additions and 9 deletions

View File

@ -60,12 +60,13 @@ namespace OpenSim.Framework.Servers.HttpServer
m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, pTimeout);
m_PollServiceWorkerThreads[i].ReQueue += ReQueueEvent;
// m_workerThreads[i]
// = Watchdog.StartThread(
// m_PollServiceWorkerThreads[i].ThreadStart,
// String.Format("PollServiceWorkerThread{0}", i),
// ThreadPriority.Normal,
// false);
m_workerThreads[i]
= Watchdog.StartThread(
m_PollServiceWorkerThreads[i].ThreadStart,
String.Format("PollServiceWorkerThread{0}", i),
ThreadPriority.Normal,
false,
int.MaxValue);
}
m_watcherThread
@ -73,7 +74,8 @@ namespace OpenSim.Framework.Servers.HttpServer
this.ThreadStart,
"PollServiceWatcherThread",
ThreadPriority.Normal,
false);
false,
1000 * 60 * 10);
}
internal void ReQueueEvent(PollServiceHttpRequest req)

View File

@ -51,7 +51,7 @@ namespace OpenSim.Framework
public int LastTick { get; set; }
/// <summary>
/// Number of seconds before we notify that the thread is having a problem.
/// Number of milliseconds before we notify that the thread is having a problem.
/// </summary>
public int Timeout { get; set; }
@ -116,7 +116,7 @@ namespace OpenSim.Framework
/// <param name="isBackground">True to run this thread as a background
/// thread, otherwise false</param>
/// <param name="timeout">
/// Number of seconds to wait until we issue a warning about timeout.
/// Number of milliseconds to wait until we issue a warning about timeout.
/// </para>
/// <returns>The newly created Thread object</returns>
public static Thread StartThread(