YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-19 19:13:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove lock to prevent dead locks

Browse Source
This commit is contained in:
Christian Kratky
2017-09-27 21:20:42 +02:00
parent 077c9ea00d
commit e947881aca
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MQTTnet.Core/Adapter/MqttChannelCommunicationAdapter.cs
+18 -19
View File
@@ -17,7 +17,7 @@ namespace MQTTnet.Core.Adapter
{ {
private readonly IMqttCommunicationChannel _channel; private readonly IMqttCommunicationChannel _channel;
private Task _sendTask = Task.FromResult(0); // this task is used to prevent overlapping write private readonly Task _waitTask = Task.FromResult(0); // this task is used to prevent overlapping write
public MqttChannelCommunicationAdapter(IMqttCommunicationChannel channel, IMqttPacketSerializer serializer) public MqttChannelCommunicationAdapter(IMqttCommunicationChannel channel, IMqttPacketSerializer serializer)
{ {
@@ -79,31 +79,30 @@ namespace MQTTnet.Core.Adapter
{ {
try try
{ {
lock (_channel) var waitTask = _waitTask;
foreach (var packet in packets)
{ {
foreach (var packet in packets) if (packet == null) { continue; }
{
if (packet == null) {continue; }
MqttTrace.Information(nameof(MqttChannelCommunicationAdapter), $"TX >>> {packet} [Timeout={timeout}]"); MqttTrace.Information(nameof(MqttChannelCommunicationAdapter), $"TX >>> {packet} [Timeout={timeout}]");
var writeBuffer = PacketSerializer.Serialize(packet); var writeBuffer = PacketSerializer.Serialize(packet);
_sendTask = _sendTask.ContinueWith(p => _channel.SendStream.WriteAsync(writeBuffer, 0, writeBuffer.Length, cancellationToken).ConfigureAwait(false), cancellationToken);
}
if (timeout > TimeSpan.Zero)
{
_sendTask = _sendTask.ContinueWith(c => _channel.SendStream.FlushAsync(cancellationToken).TimeoutAfter(timeout), cancellationToken).ConfigureAwait(false);
}
else
{
_sendTask = _sendTask.ContinueWith(c => _channel.SendStream.FlushAsync(cancellationToken), cancellationToken);
}
waitTask = waitTask.ContinueWith(t => _channel.SendStream.WriteAsync(writeBuffer, 0, writeBuffer.Length, cancellationToken).ConfigureAwait(false), cancellationToken);
} }
await _sendTask; // configure await false generates stackoverflow waitTask = waitTask.ContinueWith(t =>
{
if (timeout > TimeSpan.Zero)
{
return _channel.SendStream.FlushAsync(cancellationToken).TimeoutAfter(timeout).ConfigureAwait(false);
}
return _channel.SendStream.FlushAsync(cancellationToken).ConfigureAwait(false);
}, cancellationToken);
await waitTask; // configure await false generates stackoverflow
} }
catch (TaskCanceledException) catch (TaskCanceledException)
{ {