Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some bad memory leaks on sockets

Browse Source
This commit is contained in:
hondacrx
2017-11-06 17:59:59 -05:00
parent 71d913107d
commit 45a394cda7
3 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Networking/NetworkThread.cs
+1 -1
View File
@@ -58,7 +58,7 @@ namespace Framework.Networking
if (_newSockets.Empty())
return;
foreach (var socket in _newSockets)
foreach (var socket in _newSockets.ToArray())
{
if (!socket.IsOpen())
{
Source/Framework/Networking/SocketBase.cs
+32 -27
View File
@@ -31,7 +31,10 @@ namespace Framework.Networking
_receiveBuffer = new byte[ushort.MaxValue];
}
public virtual void Dispose() { }
public virtual void Dispose()
{
_receiveBuffer = null;
}
public abstract void Start();
@@ -57,16 +60,16 @@ namespace Framework.Networking
try
{
var socketEventargs = new SocketAsyncEventArgs();
using (var socketEventargs = new SocketAsyncEventArgs())
{
socketEventargs.SetBuffer(_receiveBuffer, 0, _receiveBuffer.Length);
socketEventargs.Completed += (sender, args) => ReadHandlerInternal(args);
socketEventargs.SocketFlags = SocketFlags.None;
socketEventargs.RemoteEndPoint = _socket.RemoteEndPoint;
socketEventargs.SetBuffer(_receiveBuffer, 0, _receiveBuffer.Length);
socketEventargs.Completed += (sender, args) => ReadHandlerInternal(args);
socketEventargs.SocketFlags = SocketFlags.None;
socketEventargs.RemoteEndPoint = _socket.RemoteEndPoint;
if (!_socket.ReceiveAsync(socketEventargs))
ReadHandlerInternal(socketEventargs);
if (!_socket.ReceiveAsync(socketEventargs))
ReadHandlerInternal(socketEventargs);
}
}
catch (Exception ex)
{
@@ -82,15 +85,15 @@ namespace Framework.Networking
try
{
var socketEventargs = new SocketAsyncEventArgs();
socketEventargs.SetBuffer(_receiveBuffer, 0, _receiveBuffer.Length);
socketEventargs.Completed += (sender, args) => callback(args);
socketEventargs.UserToken = _socket;
socketEventargs.SocketFlags = SocketFlags.None;
if (!_socket.ReceiveAsync(socketEventargs))
callback(socketEventargs);
using (var socketEventargs = new SocketAsyncEventArgs())
{
socketEventargs.SetBuffer(_receiveBuffer, 0, _receiveBuffer.Length);
socketEventargs.Completed += (sender, args) => callback(args);
socketEventargs.UserToken = _socket;
socketEventargs.SocketFlags = SocketFlags.None;
if (!_socket.ReceiveAsync(socketEventargs))
callback(socketEventargs);
}
}
catch (Exception ex)
{
@@ -122,14 +125,16 @@ namespace Framework.Networking
if (!IsOpen())
return;
var socketEventargs = new SocketAsyncEventArgs();
socketEventargs.SetBuffer(data, 0, data.Length);
socketEventargs.Completed += WriteHandlerInternal;
socketEventargs.RemoteEndPoint = _socket.RemoteEndPoint;
socketEventargs.UserToken = _socket;
socketEventargs.SocketFlags = SocketFlags.None;
using (var socketEventargs = new SocketAsyncEventArgs())
{
socketEventargs.SetBuffer(data, 0, data.Length);
socketEventargs.Completed += WriteHandlerInternal;
socketEventargs.RemoteEndPoint = _socket.RemoteEndPoint;
socketEventargs.UserToken = _socket;
socketEventargs.SocketFlags = SocketFlags.None;
_socket.SendAsync(socketEventargs);
_socket.SendAsync(socketEventargs);
}
}
void WriteHandlerInternal(object sender, SocketAsyncEventArgs args)
@@ -158,7 +163,7 @@ namespace Framework.Networking
_socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, enable);
}
public virtual void OnClose() { }
public virtual void OnClose() { Dispose(); }
public bool IsOpen() { return !_closed; }