Replacing Networking (#271)

- [X] Removing Kestrel & Libuv
- [X] Cleaning up NetState
- [X] Removing System.IO.Pipelines
- [X] Cleaning up packet reading
- [X] Adds a maximum of 5000 sockets (configurable) to prevent OOM
- [X] Replaces the AsyncState with a thread-safe wrapped boolean called NetworkState
- [X] Removes Parallel.ForEach (no perf gain)
- [X] Removes custom houses compression on another thread
- [X] Test high load scenarios

Bumps release version
This commit is contained in:
Kamron Batman 2020-10-20 20:55:19 -07:00 committed by GitHub
parent 8603e31023
commit 369a27b800
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 1780 additions and 1569 deletions

View file

@ -1,11 +1,7 @@
using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO.Pipelines;
using System.Linq;
using System.Net;
using Microsoft.AspNetCore.Connections;
using Microsoft.AspNetCore.Http.Features;
using Server.Accounting;
using Server.Network;
using Xunit;
@ -111,12 +107,7 @@ namespace Server.Tests.Network.Packets
var account = new TestAccount(new[] { firstMobile, null, null, null, null });
var ns = new NetState(
new TestConnectionContext
{
RemoteEndPoint = IPEndPoint.Parse("127.0.0.1")
}
)
var ns = new NetState(null)
{
Account = account,
ProtocolChanges = protocolChanges
@ -653,13 +644,5 @@ namespace Server.Tests.Network.Packets
public int CompareTo(TestAccount other) => other == null ? 1 : Username.CompareTo(other.Username);
}
internal class TestConnectionContext : ConnectionContext
{
public override string ConnectionId { get; set; }
public override IFeatureCollection Features { get; }
public override IDictionary<object, object> Items { get; set; }
public override IDuplexPipe Transport { get; set; }
}
}
}

View file

@ -59,12 +59,7 @@ namespace Server.Tests.Network.Packets
[Fact]
public void TestFastGumpPacket()
{
var ns = new NetState(
new AccountPacketTests.TestConnectionContext
{
RemoteEndPoint = IPEndPoint.Parse("127.0.0.1")
}
);
var ns = new NetState(null);
var gump = new ResurrectGump(2);
@ -134,12 +129,7 @@ namespace Server.Tests.Network.Packets
[Fact]
public void TestPackedGumpPacket()
{
var ns = new NetState(
new AccountPacketTests.TestConnectionContext
{
RemoteEndPoint = IPEndPoint.Parse("127.0.0.1")
}
)
var ns = new NetState(null)
{
ProtocolChanges = ProtocolChanges.Unpack
};
@ -194,9 +184,8 @@ namespace Server.Tests.Network.Packets
layoutList.Add(str);
}
var memOwner = SlabMemoryPool.Shared.Rent(bufferLength);
var buffer = memOwner.Memory.Span;
var rawBuffer = ArrayPool<byte>.Shared.Rent(bufferLength);
Span<byte> buffer = rawBuffer;
var bufferPos = 0;
foreach (var layout in layoutList)
@ -211,12 +200,12 @@ namespace Server.Tests.Network.Packets
#endif
expectedData.WritePacked(ref pos, buffer.Slice(0, bufferPos));
memOwner.Dispose();
ArrayPool<byte>.Shared.Return(rawBuffer);
expectedData.Write(ref pos, gump.Strings.Count);
bufferLength = gump.Strings.Sum(str => 2 + str.Length * 2);
memOwner = SlabMemoryPool.Shared.Rent(bufferLength);
buffer = memOwner.Memory.Span;
rawBuffer = ArrayPool<byte>.Shared.Rent(bufferLength);
buffer = rawBuffer;
bufferPos = 0;
foreach (var str in gump.Strings)
@ -225,6 +214,7 @@ namespace Server.Tests.Network.Packets
}
expectedData.WritePacked(ref pos, buffer.Slice(0, bufferPos));
ArrayPool<byte>.Shared.Return(rawBuffer);
// Length
expectedData.Slice(1, 2).Write((ushort)pos);

View file

@ -154,7 +154,7 @@ namespace Server.Tests.Network.Packets
Span<byte> expectedData = stackalloc byte[14];
var pos = 0;
expectedData.Write(ref pos, (byte)0x6E);
expectedData.Write(ref pos, (byte)0x6E); // Packet ID
expectedData.Write(ref pos, mobile);
expectedData.Write(ref pos, (ushort)action);
expectedData.Write(ref pos, (ushort)frameCount);
@ -240,12 +240,7 @@ namespace Server.Tests.Network.Packets
};
beheld.DefaultMobileInit();
var ns = new NetState(
new AccountPacketTests.TestConnectionContext
{
RemoteEndPoint = IPEndPoint.Parse("127.0.0.1")
}
)
var ns = new NetState(null)
{
ProtocolChanges = changes
};
@ -642,12 +637,7 @@ namespace Server.Tests.Network.Packets
beheld.FacialHairItemID = facialHairItemId;
beheld.FacialHairHue = facialHairHue;
var ns = new NetState(
new AccountPacketTests.TestConnectionContext
{
RemoteEndPoint = IPEndPoint.Parse("127.0.0.1")
}
)
var ns = new NetState(null)
{
ProtocolChanges = protocolChanges
};