DarthAffe/OBD.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/OBD.NET.git synced 2025-12-13 09:18:31 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix/deadlock'

Browse Source
This commit is contained in:
Darth Affe 2021-11-03 23:35:43 +01:00
commit 35af0f8c15
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs
View File

@ -197,6 +197,8 @@ namespace OBD.NET.Common.Devices
/// </summary> /// </summary>
private async void CommandWorker() private async void CommandWorker()
{ {
CancellationToken cancellationToken = _commandCancellationToken.Token;
while (!_commandCancellationToken.IsCancellationRequested) while (!_commandCancellationToken.IsCancellationRequested)
{ {
CurrentCommand = null; CurrentCommand = null;
@ -206,7 +208,7 @@ namespace OBD.NET.Common.Devices
try try
{ {
if (_commandQueue.TryTake(out CurrentCommand, 10, _commandCancellationToken.Token)) if (_commandQueue.TryTake(out CurrentCommand, 10, cancellationToken))
{ {
_queueSize--; _queueSize--;
@ -217,25 +219,20 @@ namespace OBD.NET.Common.Devices
else else
Connection.Write(Encoding.ASCII.GetBytes(CurrentCommand.CommandText)); Connection.Write(Encoding.ASCII.GetBytes(CurrentCommand.CommandText));
//wait for command to finish or command canceled // wait for command to finish or command canceled
while (!(_commandFinishedEvent.WaitOne(50) || _commandCancellationToken.IsCancellationRequested)) while (!_commandFinishedEvent.WaitOne(50))
{ cancellationToken.ThrowIfCancellationRequested();
} }
} }
} catch (OperationCanceledException)
catch (OperationCanceledException) { /*ignore, because it is thrown when the cancellation token is canceled*/}
// if canceled set all commands as completed (with null result)
if (_commandCancellationToken.IsCancellationRequested)
{ {
CurrentCommand?.CommandResult.WaitHandle.Set(); CurrentCommand?.CommandResult.WaitHandle.Set();
foreach (var cmd in _commandQueue) }
{ }
foreach (QueuedCommand cmd in _commandQueue)
cmd.CommandResult.WaitHandle.Set(); cmd.CommandResult.WaitHandle.Set();
} }
}
}
}
public void WaitQueue() => _queueEmptyEvent.WaitOne(); public void WaitQueue() => _queueEmptyEvent.WaitOne();