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

Cleans up API (#289)

Browse source 
Bumps version release
This commit is contained in:
Kamron Batman 2020-10-25 22:17:42 -07:00 • committed by GitHub
parent 990e6fe188
commit 90220feb41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,6 @@ using System.Net.Sockets;
using System.Runtime.CompilerServices;
using System.Threading;
using Server.Accounting;
using Server.Exceptions;
using Server.Gumps;
using Server.HuePickers;
using Server.Items;
@ -55,7 +54,6 @@ namespace Server.Network
private byte[] _sendBuffer;
private long m_NextCheckActivity;
private volatile bool m_Running;
private readonly Thread _sendThread;
private volatile EncodePacket _packetDecoder;
private volatile EncodePacket _packetEncoder;
@ -77,7 +75,7 @@ namespace Server.Network
Timer.DelayCall(checkAliveDuration, checkAliveDuration, CheckAllAlive);
}
public NetState(Socket connection, Thread sendThread = null)
public NetState(Socket connection)
{
m_Running = false;
Connection = connection;
@ -91,7 +89,6 @@ namespace Server.Network
_sendBuffer = new byte[SendPipeSize];
SendPipe = new Pipe<byte>(_sendBuffer);
m_NextCheckActivity = Core.TickCount + 30000;
_sendThread = sendThread ?? Core.Thread;
try
{
@ -372,8 +369,6 @@ namespace Server.Network
NetworkState.Resume(ref m_NetworkState);
}
public bool GetAvailableSendPipe(out CircularBuffer<byte> buffer) => SendPipe.Writer.GetAvailable(out buffer);
public virtual void Send(ref CircularBuffer<byte> buffer, int length)
{
if (Connection == null || BlockAllPackets || buffer.Length == 0)
@ -381,14 +376,6 @@ namespace Server.Network
return;
}
#if DEBUG
var currentThread = Thread.CurrentThread;
if (currentThread != _sendThread)
{
throw new InvalidThreadException("Attempted to send packet outside send thread!");
}
#endif
try
{
_packetEncoder?.Invoke(ref buffer, ref length);
@ -412,15 +399,6 @@ namespace Server.Network
return;
}
#if DEBUG
var currentThread = Thread.CurrentThread;
if (currentThread != _sendThread)
{
throw new InvalidThreadException("Attempted to send packet outside send thread!");
}
#endif
var writer = SendPipe.Writer;
try
@ -429,7 +407,7 @@ namespace Server.Network
if (buffer.Length > 0 && length > 0)
{
if (!GetAvailableSendPipe(out var pipeBuffer))
if (!SendPipe.Writer.GetAvailable(out var pipeBuffer))
{
p.OnSend();
return;
@ -489,7 +467,8 @@ namespace Server.Network
{
while (m_Running)
{
if (!(await reader).TryRead(segments))
var result = await reader.Read(segments);
if (result.Closed)
{
break;
}