FabInfra-Mirror/libs.capnproto-dotnetcore_Runtime
1
0
Fork 0
mirror of https://github.com/FabInfra/capnproto-dotnetcore_Runtime.git synced 2025-03-12 23:01:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nullability fixes

Browse Source
This commit is contained in:
Christian Köllner 2020-02-16 18:00:31 +01:00
parent 3e96fd0fd5
commit 1b139a1322
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Benchmarking/NuGet.Config Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>

4
Capnp.Net.Runtime/Rpc/RefCountingCapability.cs
View File

@ -29,8 +29,8 @@ namespace Capnp.Rpc
#if DebugCapabilityLifecycle #if DebugCapabilityLifecycle
ILogger Logger { get; } = Logging.CreateLogger<RefCountingCapability>(); ILogger Logger { get; } = Logging.CreateLogger<RefCountingCapability>();
string _releasingMethodName; string? _releasingMethodName;
string _releasingFilePath; string? _releasingFilePath;
int _releasingLineNumber; int _releasingLineNumber;
#endif #endif

24
Capnp.Net.Runtime/Rpc/TcpRpcServer.cs
View File

@ -60,6 +60,7 @@ namespace Capnp.Rpc
class Connection: IConnection class Connection: IConnection
{ {
readonly List<IFrameTracer> _tracers = new List<IFrameTracer>();
readonly TcpRpcServer _server; readonly TcpRpcServer _server;
Stream _stream; Stream _stream;
@ -73,6 +74,13 @@ namespace Capnp.Rpc
public void Start() public void Start()
{ {
Pump = new FramePump(_stream); Pump = new FramePump(_stream);
foreach (var tracer in _tracers)
{
Pump.AttachTracer(tracer);
}
_tracers.Clear();
OutboundEp = new OutboundTcpEndpoint(_server, Pump); OutboundEp = new OutboundTcpEndpoint(_server, Pump);
InboundEp = _server._rpcEngine.AddEndpoint(OutboundEp); InboundEp = _server._rpcEngine.AddEndpoint(OutboundEp);
Pump.FrameReceived += InboundEp.Forward; Pump.FrameReceived += InboundEp.Forward;
@ -106,16 +114,16 @@ namespace Capnp.Rpc
public ConnectionState State { get; set; } = ConnectionState.Initializing; public ConnectionState State { get; set; } = ConnectionState.Initializing;
public TcpClient Client { get; private set; } public TcpClient Client { get; private set; }
public FramePump Pump { get; private set; } public FramePump? Pump { get; private set; }
public OutboundTcpEndpoint OutboundEp { get; private set; } public OutboundTcpEndpoint? OutboundEp { get; private set; }
public RpcEngine.RpcEndpoint InboundEp { get; private set; } public RpcEngine.RpcEndpoint? InboundEp { get; private set; }
public Thread? PumpRunner { get; private set; } public Thread? PumpRunner { get; private set; }
public int? LocalPort => ((IPEndPoint)Client.Client.LocalEndPoint)?.Port; public int? LocalPort => ((IPEndPoint)Client.Client.LocalEndPoint)?.Port;
public int? RemotePort => ((IPEndPoint)Client.Client.RemoteEndPoint)?.Port; public int? RemotePort => ((IPEndPoint)Client.Client.RemoteEndPoint)?.Port;
public long RecvCount => InboundEp.RecvCount; public long RecvCount => InboundEp?.RecvCount ?? 0;
public long SendCount => InboundEp.SendCount; public long SendCount => InboundEp?.SendCount ?? 0;
public bool IsComputing => PumpRunner?.ThreadState == ThreadState.Running; public bool IsComputing => PumpRunner?.ThreadState == ThreadState.Running;
public bool IsWaitingForData => Pump.IsWaitingForData; public bool IsWaitingForData => Pump?.IsWaitingForData ?? false;
public void AttachTracer(IFrameTracer tracer) public void AttachTracer(IFrameTracer tracer)
{ {
@ -125,7 +133,7 @@ namespace Capnp.Rpc
if (State != ConnectionState.Initializing) if (State != ConnectionState.Initializing)
throw new InvalidOperationException("Connection is not in state 'Initializing'"); throw new InvalidOperationException("Connection is not in state 'Initializing'");
Pump.AttachTracer(tracer); _tracers.Add(tracer);
} }
/// <summary> /// <summary>
@ -248,7 +256,7 @@ namespace Capnp.Rpc
foreach (var connection in connections) foreach (var connection in connections)
{ {
connection.Client.Dispose(); connection.Client.Dispose();
connection.Pump.Dispose(); connection.Pump?.Dispose();
SafeJoin(connection.PumpRunner); SafeJoin(connection.PumpRunner);
} }