warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Send locking for NewAsyncSockets

Browse source
This commit is contained in:
Mark Sturgill 2013-10-11 13:19:50 -07:00
parent 2061a88da3
commit f892ad28a3
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Server/Network/NetState.cs
View file

@ -627,16 +627,14 @@ namespace Server.Network {
lock (m_SendQueue)
gram = m_SendQueue.Enqueue(buffer, length);
if (gram != null) {
if (gram != null && !_sending) {
_sending = true;
#if NewAsyncSockets
m_SendEventArgs.SetBuffer( gram.Buffer, 0, gram.Length );
Send_Start();
#else
try {
if (!_sending) {
_sending = true;
m_Socket.BeginSend(gram.Buffer, 0, gram.Length, SocketFlags.None, m_OnSend, m_Socket);
}
}
catch (Exception ex) {
TraceException(ex);
@ -779,6 +777,9 @@ namespace Server.Network {
if ( gram != null ) {
m_SendEventArgs.SetBuffer( gram.Buffer, 0, gram.Length );
Send_Start();
} else {
lock (_sendL)
_sending = false;
}
}
@ -829,18 +830,24 @@ namespace Server.Network {
if ( m_Socket == null )
return false;
SendQueue.Gram gram;
lock ( m_SendQueue ) {
if (!m_SendQueue.IsFlushReady)
lock (_sendL) {
if (_sending)
return false;
gram = m_SendQueue.CheckFlushReady();
}
SendQueue.Gram gram;
if ( gram != null ) {
m_SendEventArgs.SetBuffer( gram.Buffer, 0, gram.Length );
Send_Start();
lock ( m_SendQueue ) {
if (!m_SendQueue.IsFlushReady)
return false;
gram = m_SendQueue.CheckFlushReady();
}
if ( gram != null ) {
_sending = true;
m_SendEventArgs.SetBuffer( gram.Buffer, 0, gram.Length );
Send_Start();
}
}
return false;