diff options
| author | UbitUmarov | 2017-05-26 00:53:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-26 00:53:21 +0100 |
| commit | 5287489a3c0c8c0d5b6fe739d6c0a334a12eee6a (patch) | |
| tree | c1f678481c012c7a4a3b70598b9a21f2d3f7068d /OpenSim | |
| parent | make BlockingQueue.Dequeue timeouts more coerent (just less than watchdog tim... (diff) | |
| download | opensim-SC_OLD-5287489a3c0c8c0d5b6fe739d6c0a334a12eee6a.zip opensim-SC_OLD-5287489a3c0c8c0d5b6fe739d6c0a334a12eee6a.tar.gz opensim-SC_OLD-5287489a3c0c8c0d5b6fe739d6c0a334a12eee6a.tar.bz2 opensim-SC_OLD-5287489a3c0c8c0d5b6fe739d6c0a334a12eee6a.tar.xz | |
avoid some wrong watchdog timeouts
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index aed1372..f68c5f8 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
| @@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
| 658 | public void Process() | 658 | public void Process() |
| 659 | { | 659 | { |
| 660 | _finished = false; | 660 | _finished = false; |
| 661 | httpThread = WorkManager.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false); | 661 | httpThread = WorkManager.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false, null, int.MaxValue); |
| 662 | } | 662 | } |
| 663 | 663 | ||
| 664 | /* | 664 | /* |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 1688aa6..e01d2e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
| @@ -226,9 +226,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 226 | try | 226 | try |
| 227 | { | 227 | { |
| 228 | Thread.Sleep(cmdHandlerThreadCycleSleepms); | 228 | Thread.Sleep(cmdHandlerThreadCycleSleepms); |
| 229 | 229 | Watchdog.UpdateThread(); | |
| 230 | DoOneCmdHandlerPass(); | 230 | DoOneCmdHandlerPass(); |
| 231 | |||
| 232 | Watchdog.UpdateThread(); | 231 | Watchdog.UpdateThread(); |
| 233 | } | 232 | } |
| 234 | catch ( System.Threading.ThreadAbortException) { } | 233 | catch ( System.Threading.ThreadAbortException) { } |