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

another async variant

Browse Source
This commit is contained in:
Christian Köllner 2020-04-21 21:42:51 +02:00
parent 73bd1de241
commit 87575f12bf
5 changed files with 35 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Benchmarking/Benchmark/Benchmark.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
<PackageReference Include="Capnp.Net.Runtime" Version="1.3.92-gdb2d6bce2e" />
<PackageReference Include="Capnp.Net.Runtime" Version="1.3.93-g73bd1de241" />
<PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="1.2.138" />
<PackageReference Include="Google.Protobuf" Version="3.11.3" />
<PackageReference Include="Grpc.Net.Client" Version="2.27.0" />

2
Benchmarking/EchoServiceCapnp/EchoServiceCapnp.csproj
View File

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Capnp.Net.Runtime" Version="1.3.92-gdb2d6bce2e" />
<PackageReference Include="Capnp.Net.Runtime" Version="1.3.93-g73bd1de241" />
<PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="1.3.92-gdb2d6bce2e" />
</ItemGroup>

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

@ -17,7 +17,7 @@ namespace Capnp.Rpc
/// <param name="bufferSize">Buffer size (bytes). You should choose it according to the maximum expected raw capnp frame size</param>
public static void AddBuffering(this ISupportsMidlayers obj, int bufferSize)
{
obj.InjectMidlayer(s => new Util.WriteBufferedStream(new Util.BufferedNetworkStreamAdapter(s, bufferSize), bufferSize));
obj.InjectMidlayer(s => new Util.DuplexBufferedStream(new Util.AsyncNetworkStreamAdapter(s), bufferSize));
}
/// <summary>
@ -27,7 +27,7 @@ namespace Capnp.Rpc
/// <param name="obj"><see cref="TcpRpcServer"/> or <see cref="TcpRpcClient"/></param>
public static void AddBuffering(this ISupportsMidlayers obj)
{
obj.InjectMidlayer(s => new Util.WriteBufferedStream(new Util.BufferedNetworkStreamAdapter(s)));
obj.InjectMidlayer(s => new Util.DuplexBufferedStream(new Util.AsyncNetworkStreamAdapter(s)));
}
}
}

60
Capnp.Net.Runtime/Util/WriteBufferedStream.cs → Capnp.Net.Runtime/Util/AsyncNetworkStreamAdapter.cs
View File

@ -1,28 +1,19 @@
using System;
using System.IO;
using System.Net.Sockets;
using System.Threading;
namespace Capnp.Util
{
internal class WriteBufferedStream : Stream
internal class AsyncNetworkStreamAdapter : Stream
{
// A buffer size of 1024 bytes seems to be a good comprise, giving good performance
// in TCP/IP-over-localhost scenarios for small to medium (200kiB) frame sizes.
const int DefaultBufferSize = 1024;
readonly Stream _readStream;
readonly BufferedStream _writeStream;
readonly int _bufferSize;
readonly NetworkStream _stream;
readonly object _reentrancyBlocker = new object();
//Exception? _bufferedException;
public WriteBufferedStream(Stream stream, int bufferSize)
{
_readStream = stream;
_writeStream = new BufferedStream(stream, bufferSize);
_bufferSize = bufferSize;
}
public WriteBufferedStream(Stream stream) : this(stream, DefaultBufferSize)
public AsyncNetworkStreamAdapter(Stream stream)
{
_stream = stream as NetworkStream ?? throw new ArgumentException("stream argument must be a NetworkStream");
}
public override bool CanRead => true;
@ -41,12 +32,12 @@ namespace Capnp.Util
public override void Flush()
{
_writeStream.Flush();
_stream.Flush();
}
public override int Read(byte[] buffer, int offset, int count)
{
return _readStream.Read(buffer, offset, count);
return _stream.Read(buffer, offset, count);
}
public override long Seek(long offset, SeekOrigin origin)
@ -59,12 +50,30 @@ namespace Capnp.Util
throw new NotSupportedException();
}
//void WriteCallback(IAsyncResult ar)
//{
// try
// {
// _stream.EndWrite(ar);
// }
// catch (Exception exception)
// {
// Volatile.Write(ref _bufferedException, exception);
// }
//}
public override void Write(byte[] buffer, int offset, int count)
{
if (buffer.Length > _bufferSize) // avoid moiré-like timing effects
_writeStream.Flush();
_stream.WriteAsync(buffer, offset, count);
//var exception = Volatile.Read(ref _bufferedException);
_writeStream.Write(buffer, offset, count);
//if (exception != null)
//{
// Dispose();
// throw exception;
//}
//_stream.BeginWrite(buffer, offset, count, WriteCallback, null);
}
protected override void Dispose(bool disposing)
@ -75,14 +84,7 @@ namespace Capnp.Util
{
try
{
_readStream.Dispose();
}
catch
{
}
try
{
_writeStream.Dispose();
_stream.Dispose();
}
catch
{

114
Capnp.Net.Runtime/Util/BufferedNetworkStreamAdapter.cs
View File

@ -1,114 +0,0 @@
using System;
using System.IO;
using System.Net.Sockets;
using System.Threading;
namespace Capnp.Util
{
internal class BufferedNetworkStreamAdapter : Stream
{
// A buffer size of 1024 bytes seems to be a good comprise, giving good performance
// in TCP/IP-over-localhost scenarios for small to medium (200kiB) frame sizes.
const int DefaultBufferSize = 1024;
readonly BufferedStream _readStream;
readonly NetworkStream _writeStream;
readonly object _reentrancyBlocker = new object();
Exception? _bufferedException;
public BufferedNetworkStreamAdapter(Stream stream, int bufferSize)
{
_readStream = new BufferedStream(stream, bufferSize);
_writeStream = stream as NetworkStream ?? throw new ArgumentException("stream argument must be a NetworkStream");
}
public BufferedNetworkStreamAdapter(Stream stream) : this(stream, DefaultBufferSize)
{
}
public override bool CanRead => true;
public override bool CanSeek => false;
public override bool CanWrite => true;
public override long Length => 0;
public override long Position
{
get => 0;
set => throw new NotSupportedException();
}
public override void Flush()
{
_writeStream.Flush();
}
public override int Read(byte[] buffer, int offset, int count)
{
return _readStream.Read(buffer, offset, count);
}
public override long Seek(long offset, SeekOrigin origin)
{
throw new NotSupportedException();
}
public override void SetLength(long value)
{
throw new NotSupportedException();
}
void WriteCallback(IAsyncResult ar)
{
try
{
_writeStream.EndWrite(ar);
}
catch (Exception exception)
{
Volatile.Write(ref _bufferedException, exception);
}
}
public override void Write(byte[] buffer, int offset, int count)
{
var exception = Volatile.Read(ref _bufferedException);
if (exception != null)
{
Dispose();
throw exception;
}
_writeStream.BeginWrite(buffer, offset, count, WriteCallback, null);
}
protected override void Dispose(bool disposing)
{
if (disposing)
{
lock (_reentrancyBlocker)
{
try
{
_readStream.Dispose();
}
catch
{
}
try
{
_writeStream.Dispose();
}
catch
{
}
}
}
base.Dispose(disposing);
}
}
}