aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-25 23:26:21 +0100
committerJustin Clark-Casey (justincc)2011-10-25 23:26:21 +0100
commitc275c229281c9a7113659457a310da775f26ec43 (patch)
tree0d78d4dd2c44f262957bbb4a0a603806f3839f21 /OpenSim
parentIn Watchdog, add ability to specific timeout for a thread. (diff)
downloadopensim-SC_OLD-c275c229281c9a7113659457a310da775f26ec43.zip
opensim-SC_OLD-c275c229281c9a7113659457a310da775f26ec43.tar.gz
opensim-SC_OLD-c275c229281c9a7113659457a310da775f26ec43.tar.bz2
opensim-SC_OLD-c275c229281c9a7113659457a310da775f26ec43.tar.xz
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)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs16
-rw-r--r--OpenSim/Framework/Watchdog.cs4
2 files changed, 11 insertions, 9 deletions
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
60 m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, pTimeout); 60 m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, pTimeout);
61 m_PollServiceWorkerThreads[i].ReQueue += ReQueueEvent; 61 m_PollServiceWorkerThreads[i].ReQueue += ReQueueEvent;
62 62
63// m_workerThreads[i] 63 m_workerThreads[i]
64// = Watchdog.StartThread( 64 = Watchdog.StartThread(
65// m_PollServiceWorkerThreads[i].ThreadStart, 65 m_PollServiceWorkerThreads[i].ThreadStart,
66// String.Format("PollServiceWorkerThread{0}", i), 66 String.Format("PollServiceWorkerThread{0}", i),
67// ThreadPriority.Normal, 67 ThreadPriority.Normal,
68// false); 68 false,
69 int.MaxValue);
69 } 70 }
70 71
71 m_watcherThread 72 m_watcherThread
@@ -73,7 +74,8 @@ namespace OpenSim.Framework.Servers.HttpServer
73 this.ThreadStart, 74 this.ThreadStart,
74 "PollServiceWatcherThread", 75 "PollServiceWatcherThread",
75 ThreadPriority.Normal, 76 ThreadPriority.Normal,
76 false); 77 false,
78 1000 * 60 * 10);
77 } 79 }
78 80
79 internal void ReQueueEvent(PollServiceHttpRequest req) 81 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
51 public int LastTick { get; set; } 51 public int LastTick { get; set; }
52 52
53 /// <summary> 53 /// <summary>
54 /// Number of seconds before we notify that the thread is having a problem. 54 /// Number of milliseconds before we notify that the thread is having a problem.
55 /// </summary> 55 /// </summary>
56 public int Timeout { get; set; } 56 public int Timeout { get; set; }
57 57
@@ -116,7 +116,7 @@ namespace OpenSim.Framework
116 /// <param name="isBackground">True to run this thread as a background 116 /// <param name="isBackground">True to run this thread as a background
117 /// thread, otherwise false</param> 117 /// thread, otherwise false</param>
118 /// <param name="timeout"> 118 /// <param name="timeout">
119 /// Number of seconds to wait until we issue a warning about timeout. 119 /// Number of milliseconds to wait until we issue a warning about timeout.
120 /// </para> 120 /// </para>
121 /// <returns>The newly created Thread object</returns> 121 /// <returns>The newly created Thread object</returns>
122 public static Thread StartThread( 122 public static Thread StartThread(