DarthAffe/OBD.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/OBD.NET.git synced 2025-12-12 16:58:30 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: DarthAffe:d214f87fffdb19c05ce09295a9804d161a24becb
Branches Tags
DarthAffe:master
DarthAffe:NamingFix
DarthAffe:derskythe/master
DarthAffe:fix/deadlock
DarthAffe:C#6
DarthAffe:DTC
...
compare: DarthAffe:35af0f8c151cb33e635fc260e1fcaf21791e3991
Branches Tags
DarthAffe:master
DarthAffe:NamingFix
DarthAffe:derskythe/master
DarthAffe:fix/deadlock
DarthAffe:C#6
DarthAffe:DTC

4 Commits
d214f87fff ... 35af0f8c15

Author SHA1 Message Date
Darth Affe
35af0f8c15 Merge branch 'fix/deadlock' 2021-11-03 23:35:43 +01:00
DarthAffe
1419ed7755
Merge pull request #24 from MB512/fix/deadlock 
Fix deadlock on connection lost
 2021-11-03 23:35:10 +01:00
Darth Affe
b007471ed6 Refactored deadlock fix 2021-11-03 23:31:57 +01:00
Malte Bitter
34940632a3 Fix deadlock on connection lost 2021-09-16 11:39:34 +02:00
1 changed files with 13 additions and 4 deletions
Show Stats Expand all files Collapse all files

17
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,12 +219,19 @@ 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 // wait for command to finish or command canceled
_commandFinishedEvent.WaitOne(); while (!_commandFinishedEvent.WaitOne(50))
cancellationToken.ThrowIfCancellationRequested();
} }
} }
catch (OperationCanceledException) { /*ignore, because it is thrown when the cancellation token is canceled*/} catch (OperationCanceledException)
{
CurrentCommand?.CommandResult.WaitHandle.Set();
}
} }
foreach (QueuedCommand cmd in _commandQueue)
cmd.CommandResult.WaitHandle.Set();
} }
public void WaitQueue() => _queueEmptyEvent.WaitOne(); public void WaitQueue() => _queueEmptyEvent.WaitOne();