diff options
author | UbitUmarov | 2017-05-26 00:47:08 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-26 00:47:08 +0100 |
commit | 7a82c7c5b2a897ba1bd64c2badb71fe93c674246 (patch) | |
tree | 0994496022f8f9a5c770b05feeb7a258c83acf94 /OpenSim/Region/CoreModules/World | |
parent | missing file change.. actually use watchdog threads on assetsconnector and (diff) | |
download | opensim-SC-7a82c7c5b2a897ba1bd64c2badb71fe93c674246.zip opensim-SC-7a82c7c5b2a897ba1bd64c2badb71fe93c674246.tar.gz opensim-SC-7a82c7c5b2a897ba1bd64c2badb71fe93c674246.tar.bz2 opensim-SC-7a82c7c5b2a897ba1bd64c2badb71fe93c674246.tar.xz |
make BlockingQueue.Dequeue timeouts more coerent (just less than watchdog timeout)
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 00c8279..03a4d34 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -716,12 +716,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
716 | { | 716 | { |
717 | while (true) | 717 | while (true) |
718 | { | 718 | { |
719 | Watchdog.UpdateThread(); | ||
720 | |||
721 | av = null; | 719 | av = null; |
722 | st = null; | 720 | st = null; |
723 | 721 | ||
724 | st = requests.Dequeue(4900); // timeout to make watchdog happy | 722 | st = requests.Dequeue(4500); |
723 | Watchdog.UpdateThread(); | ||
725 | 724 | ||
726 | if (st == null || st.agentID == UUID.Zero) | 725 | if (st == null || st.agentID == UUID.Zero) |
727 | continue; | 726 | continue; |
@@ -1152,10 +1151,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1152 | { | 1151 | { |
1153 | while(!m_mapBlockRequestEvent.WaitOne(4900)) | 1152 | while(!m_mapBlockRequestEvent.WaitOne(4900)) |
1154 | { | 1153 | { |
1154 | Watchdog.UpdateThread(); | ||
1155 | if(m_scene == null) | 1155 | if(m_scene == null) |
1156 | return; | 1156 | return; |
1157 | } | 1157 | } |
1158 | 1158 | Watchdog.UpdateThread(); | |
1159 | lock (m_mapBlockRequestEvent) | 1159 | lock (m_mapBlockRequestEvent) |
1160 | { | 1160 | { |
1161 | int total = 0; | 1161 | int total = 0; |