diff options
author | Melanie | 2009-10-09 12:17:55 +0100 |
---|---|---|
committer | Melanie | 2009-10-09 12:17:55 +0100 |
commit | 23586b69a16c75b8c7cc9a99d1a7693686285ff7 (patch) | |
tree | c75c17fb008bb6057e427e6747385d9b871ca477 /OpenSim/Region | |
parent | Change the backup thread to run on a BackgroundWorker instead of a Thread. I ... (diff) | |
download | opensim-SC-23586b69a16c75b8c7cc9a99d1a7693686285ff7.zip opensim-SC-23586b69a16c75b8c7cc9a99d1a7693686285ff7.tar.gz opensim-SC-23586b69a16c75b8c7cc9a99d1a7693686285ff7.tar.bz2 opensim-SC-23586b69a16c75b8c7cc9a99d1a7693686285ff7.tar.xz |
Slow down the packet receiving code again after new reports of thread storms.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs index 9b1751d..e78a4fe 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs | |||
@@ -198,9 +198,6 @@ namespace OpenMetaverse | |||
198 | // to AsyncBeginReceive | 198 | // to AsyncBeginReceive |
199 | if (!m_shutdownFlag) | 199 | if (!m_shutdownFlag) |
200 | { | 200 | { |
201 | // start another receive - this keeps the server going! | ||
202 | AsyncBeginReceive(); | ||
203 | |||
204 | // get the buffer that was created in AsyncBeginReceive | 201 | // get the buffer that was created in AsyncBeginReceive |
205 | // this is the received data | 202 | // this is the received data |
206 | //WrappedObject<UDPPacketBuffer> wrappedBuffer = (WrappedObject<UDPPacketBuffer>)iar.AsyncState; | 203 | //WrappedObject<UDPPacketBuffer> wrappedBuffer = (WrappedObject<UDPPacketBuffer>)iar.AsyncState; |
@@ -219,7 +216,14 @@ namespace OpenMetaverse | |||
219 | } | 216 | } |
220 | catch (SocketException) { } | 217 | catch (SocketException) { } |
221 | catch (ObjectDisposedException) { } | 218 | catch (ObjectDisposedException) { } |
222 | //finally { wrappedBuffer.Dispose(); } | 219 | finally |
220 | { | ||
221 | // wrappedBuffer.Dispose(); | ||
222 | |||
223 | // start another receive - this keeps the server going! | ||
224 | AsyncBeginReceive(); | ||
225 | } | ||
226 | |||
223 | } | 227 | } |
224 | } | 228 | } |
225 | 229 | ||