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

fix: Fixes networking (#822)

Browse source 
* Fixes wepoll to be POSIX compliant.
This commit is contained in:
Kamron Batman 2021-10-09 11:55:31 -07:00 • committed by GitHub
parent 05ff3f2ad9
commit 81486772f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 60 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Projects/Server/Network/NetState/NetState.cs
View file

@ -48,7 +48,7 @@ namespace Server.Network
private const int MenuCap = 512;
private const int PacketPerSecondThreshold = 3000;
private static NetState[] _polledStates = new NetState[2048];
private static GCHandle[] _polledStates = new GCHandle[2048];
private static readonly IPollGroup _pollGroup = PollGroup.Create();
private static readonly Queue<NetState> FlushPending = new(2048);
private static readonly Queue<NetState> FlushedPartials = new(2048);
@ -101,7 +101,7 @@ namespace Server.Network
Timer.DelayCall(TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(1.5), CheckAllAlive);
}
public NetState(ISocket connection)
public NetState(Socket connection)
{
Connection = connection;
Seeded = false;
@ -130,7 +130,7 @@ namespace Server.Network
try
{
_pollGroup.Add(this);
_pollGroup.Add(connection, _handle);
}
catch (Exception ex)
{
@ -171,7 +171,7 @@ namespace Server.Network
public Pipe<byte> SendPipe { get; }
public ISocket Connection { get; }
public Socket Connection { get; }
public bool CompressionEnabled { get; set; }
@ -885,8 +885,8 @@ namespace Server.Network
{
for (int i = 0; i < count; i++)
{
_polledStates[i].HandleReceive();
_polledStates[i] = null;
(_polledStates[i].Target as NetState)?.HandleReceive();
_polledStates[i] = default;
}
}
@ -1032,7 +1032,7 @@ namespace Server.Network
TcpServer.Instances.Remove(this);
try
{
_pollGroup.Remove(this);
_pollGroup.Remove(Connection);
}
catch (Exception ex)
{