luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
luosheng
2023-07-14 07:27:37 +08:00
parent fd8f0dee86
commit 86d444ea04
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Modbus.Net/Modbus.Net/Controller/FifoController.cs
View File

@@ -47,17 +47,17 @@ namespace Modbus.Net
/// <inheritdoc /> /// <inheritdoc />
protected override void SendingMessageControlInner() protected override void SendingMessageControlInner()
{ {
try _taskCycleSema?.WaitOne();
while (!_taskCancel)
{ {
_taskCycleSema?.WaitOne(); if (AcquireTime > 0)
while (!_taskCancel)
{ {
if (AcquireTime > 0) Thread.Sleep(AcquireTime);
{ }
Thread.Sleep(AcquireTime); bool sendSuccess = false;
} lock (WaitingMessages)
bool sendSuccess = false; {
lock (WaitingMessages) try
{ {
if (_currentSendingPos == null) if (_currentSendingPos == null)
{ {
@@ -84,21 +84,23 @@ namespace Modbus.Net
} }
} }
} }
if (sendSuccess) catch (ObjectDisposedException e)
{ {
_taskCycleSema?.WaitOne(); logger.LogError(e, "Controller _currentSendingPos disposed");
_currentSendingPos = null;
sendSuccess = true;
}
catch (Exception e)
{
logger.LogError(e, "Controller throws exception");
_taskCancel = true;
} }
} }
if (sendSuccess)
{
_taskCycleSema?.WaitOne();
}
} }
catch (ObjectDisposedException)
{
//ignore
}
catch (Exception e)
{
logger.LogError(e, "Controller throws exception");
}
} }
/// <inheritdoc /> /// <inheritdoc />