Skip to content

Commit c58234c

Browse files
author
Stefán Jökull Sigurðarson
committed
More code cleanups.
1 parent e34d2de commit c58234c

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs

+3-7
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ internal sealed class SocketFrameHandler : IFrameHandler
6767
private readonly ITcpClient _socket;
6868

6969
// Channels
70-
private readonly Channel<ReadOnlyMemory<byte>> _outboundChannel = Channel.CreateUnbounded<ReadOnlyMemory<byte>>(new UnboundedChannelOptions { AllowSynchronousContinuations = false, SingleReader = true, SingleWriter = false });
70+
private readonly Channel<ReadOnlyMemory<byte>> _outboundChannel = Channel.CreateUnbounded<ReadOnlyMemory<byte>>(new UnboundedChannelOptions { AllowSynchronousContinuations = true, SingleReader = true, SingleWriter = false });
7171
private ChannelWriter<ReadOnlyMemory<byte>> OutboundChannelWriter => _outboundChannel.Writer;
7272
private ChannelReader<ReadOnlyMemory<byte>> OutboundChannelReader => _outboundChannel.Reader;
7373

@@ -78,13 +78,10 @@ internal sealed class SocketFrameHandler : IFrameHandler
7878
private PipeWriter PipeWriter => _pipe.Output;
7979

8080
// Pipe tasks
81-
//private Task _writerTask;
81+
private readonly Task _writerTask;
8282

8383
private readonly object _semaphore = new object();
8484
private bool _closed;
85-
private readonly object _writeLock = new object();
86-
87-
private readonly Task _writerTask;
8885

8986
public SocketFrameHandler(AmqpTcpEndpoint endpoint, Func<AddressFamily, ITcpClient> socketFactory, TimeSpan connectionTimeout, TimeSpan readTimeout, TimeSpan writeTimeout)
9087
{
@@ -125,7 +122,7 @@ public SocketFrameHandler(AmqpTcpEndpoint endpoint, Func<AddressFamily, ITcpClie
125122
}
126123

127124
_socket.ReceiveTimeout = readTimeout;
128-
var pipeOptions = new PipeOptions(useSynchronizationContext: false);
125+
var pipeOptions = new PipeOptions(useSynchronizationContext: true);
129126

130127
if (endpoint.Ssl.Enabled)
131128
{
@@ -146,7 +143,6 @@ public SocketFrameHandler(AmqpTcpEndpoint endpoint, Func<AddressFamily, ITcpClie
146143

147144
WriteTimeout = writeTimeout;
148145
_writerTask = Task.Run(WriteLoop);
149-
//_readerTask = Task.Run(ReadLoop);
150146
}
151147
public AmqpTcpEndpoint Endpoint { get; set; }
152148

0 commit comments

Comments
 (0)