From c275c229281c9a7113659457a310da775f26ec43 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 25 Oct 2011 23:26:21 +0100 Subject: 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) --- .../Servers/HttpServer/PollServiceRequestManager.cs | 16 +++++++++------- OpenSim/Framework/Watchdog.cs | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index ea30b9a..d9965b6 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs @@ -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) diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index 1374518..5ffa890 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs @@ -51,7 +51,7 @@ namespace OpenSim.Framework public int LastTick { get; set; } /// - /// 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. /// public int Timeout { get; set; } @@ -116,7 +116,7 @@ namespace OpenSim.Framework /// True to run this thread as a background /// thread, otherwise false /// - /// Number of seconds to wait until we issue a warning about timeout. + /// Number of milliseconds to wait until we issue a warning about timeout. /// /// The newly created Thread object public static Thread StartThread( -- cgit v1.1