Improve managed content throughput
This commit is contained in:
parent
26b4d1eadc
commit
a311cbe8cb
8 changed files with 292 additions and 62 deletions
|
|
@ -7,6 +7,23 @@ using System.Threading.Tasks;
|
|||
|
||||
namespace GameCult.Networking
|
||||
{
|
||||
/// <summary>
|
||||
/// Result of a bounded non-blocking RUDP schema-server drain.
|
||||
/// </summary>
|
||||
public readonly struct RudpCultNetSchemaPollResult
|
||||
{
|
||||
public RudpCultNetSchemaPollResult(int transportItemsConsumed, int messagesDispatched)
|
||||
{
|
||||
TransportItemsConsumed = transportItemsConsumed;
|
||||
MessagesDispatched = messagesDispatched;
|
||||
}
|
||||
|
||||
/// <summary>Gets transport work consumed, including ACK and connection control packets.</summary>
|
||||
public int TransportItemsConsumed { get; }
|
||||
/// <summary>Gets application schema messages dispatched.</summary>
|
||||
public int MessagesDispatched { get; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Options for hosting schema-v0 messages over the native CultNet RUDP listener.
|
||||
/// </summary>
|
||||
|
|
@ -223,12 +240,37 @@ namespace GameCult.Networking
|
|||
/// </summary>
|
||||
public async Task<bool> PollOnceAsync()
|
||||
{
|
||||
var delivered = _transport.ReceiveOnce();
|
||||
if (delivered == null || !string.Equals(delivered.Frame.ChannelId, "schema", StringComparison.Ordinal))
|
||||
if (!_transport.TryReceiveOnce(out var delivered) || delivered == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return await DispatchAsync(delivered).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Drains up to <paramref name="maxTransportItems"/> immediately available transport work items.
|
||||
/// Control packets count as progress so callers only idle when the transport is actually empty.
|
||||
/// </summary>
|
||||
public async Task<RudpCultNetSchemaPollResult> PollAvailableAsync(int maxTransportItems)
|
||||
{
|
||||
if (maxTransportItems <= 0) throw new ArgumentOutOfRangeException(nameof(maxTransportItems));
|
||||
var consumed = 0;
|
||||
var dispatched = 0;
|
||||
while (consumed < maxTransportItems && _transport.TryReceiveOnce(out var delivered))
|
||||
{
|
||||
consumed++;
|
||||
if (delivered != null && await DispatchAsync(delivered).ConfigureAwait(false))
|
||||
dispatched++;
|
||||
}
|
||||
return new RudpCultNetSchemaPollResult(consumed, dispatched);
|
||||
}
|
||||
|
||||
private async Task<bool> DispatchAsync(CultNetRudpSocketServerFrame delivered)
|
||||
{
|
||||
if (!string.Equals(delivered.Frame.ChannelId, "schema", StringComparison.Ordinal))
|
||||
return false;
|
||||
|
||||
var message = CultNetSchemaMessageSerialization.Deserialize(delivered.Frame.Payload);
|
||||
if (!_handlers.TryGetValue(message.GetType(), out var handler) || handler == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2196,12 +2196,25 @@ namespace GameCult.Networking
|
|||
/// Polls the UDP socket once and returns the next delivered peer frame if one is available.
|
||||
/// </summary>
|
||||
public CultNetRudpSocketServerFrame? ReceiveOnce()
|
||||
{
|
||||
TryReceiveOnce(out var delivered);
|
||||
return delivered;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Consumes one available transport work item and reports whether transport progress was made,
|
||||
/// independently of whether that work item completed an application frame.
|
||||
/// </summary>
|
||||
public bool TryReceiveOnce(out CultNetRudpSocketServerFrame? delivered)
|
||||
{
|
||||
if (_deliveredFrames.Count > 0)
|
||||
{
|
||||
return _deliveredFrames.Dequeue();
|
||||
delivered = _deliveredFrames.Dequeue();
|
||||
return true;
|
||||
}
|
||||
|
||||
delivered = null;
|
||||
|
||||
var buffer = new byte[65535];
|
||||
EndPoint remote = new IPEndPoint(IPAddress.Any, 0);
|
||||
int received;
|
||||
|
|
@ -2209,7 +2222,7 @@ namespace GameCult.Networking
|
|||
{
|
||||
if (!_socket.Poll(0, SelectMode.SelectRead))
|
||||
{
|
||||
return null;
|
||||
return false;
|
||||
}
|
||||
|
||||
received = _socket.ReceiveFrom(buffer, ref remote);
|
||||
|
|
@ -2218,14 +2231,14 @@ namespace GameCult.Networking
|
|||
error.SocketErrorCode == SocketError.WouldBlock ||
|
||||
error.SocketErrorCode == SocketError.TimedOut)
|
||||
{
|
||||
return null;
|
||||
return false;
|
||||
}
|
||||
catch (SocketException error) when (
|
||||
error.SocketErrorCode == SocketError.ConnectionReset ||
|
||||
error.SocketErrorCode == SocketError.ConnectionAborted ||
|
||||
error.SocketErrorCode == SocketError.Shutdown)
|
||||
{
|
||||
return null;
|
||||
return false;
|
||||
}
|
||||
|
||||
_stats.BytesReceived += received;
|
||||
|
|
@ -2239,12 +2252,12 @@ namespace GameCult.Networking
|
|||
}
|
||||
catch (InvalidOperationException)
|
||||
{
|
||||
return null;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (packet.ConnectionId != _connectionId)
|
||||
{
|
||||
return null;
|
||||
return true;
|
||||
}
|
||||
|
||||
var peerKey = RemoteKey(remote);
|
||||
|
|
@ -2261,12 +2274,12 @@ namespace GameCult.Networking
|
|||
}));
|
||||
_peers[peerKey] = peer;
|
||||
SendPacket(peer.RemoteEndPoint, peer.Session.AcceptConnect(packet, NowMs(), _acceptPayload));
|
||||
return null;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!_peers.TryGetValue(peerKey, out var existingPeer))
|
||||
{
|
||||
return null;
|
||||
return true;
|
||||
}
|
||||
|
||||
var result = existingPeer.Session.Receive(packet, NowMs());
|
||||
|
|
@ -2278,7 +2291,7 @@ namespace GameCult.Networking
|
|||
{
|
||||
existingPeer.DisconnectReason = result.DisconnectReason;
|
||||
_peers.Remove(peerKey);
|
||||
return null;
|
||||
return true;
|
||||
}
|
||||
|
||||
foreach (var frame in result.Delivered)
|
||||
|
|
@ -2295,13 +2308,13 @@ namespace GameCult.Networking
|
|||
_stats.FramesReceived++;
|
||||
}
|
||||
|
||||
var delivered = _deliveredFrames.Count > 0 ? _deliveredFrames.Dequeue() : null;
|
||||
delivered = _deliveredFrames.Count > 0 ? _deliveredFrames.Dequeue() : null;
|
||||
if (packet.PacketType == CultNetRudpPacketType.Data || delivered != null)
|
||||
{
|
||||
SendPacket(existingPeer.RemoteEndPoint, existingPeer.Session.CreateAck());
|
||||
}
|
||||
|
||||
return delivered;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Reference in a new issue