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 09:46:21 +08:00
parent 0aad91338e
commit 89d26ba0c7
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ namespace Modbus.Net
private bool _taskCancel = false; private bool _taskCancel = false;
private bool _activeSema = false; private bool _activateSema = false;
private int _waitingListMaxCount; private int _waitingListMaxCount;
@@ -39,17 +39,17 @@ namespace Modbus.Net
: base(lengthCalc, checkRightFunc) : base(lengthCalc, checkRightFunc)
{ {
_waitingListMaxCount = int.Parse(waitingListMaxCount != null ? waitingListMaxCount.ToString() : null ?? ConfigurationReader.GetValueDirect("Controller", "WaitingListCount")); _waitingListMaxCount = int.Parse(waitingListMaxCount != null ? waitingListMaxCount.ToString() : null ?? ConfigurationReader.GetValueDirect("Controller", "WaitingListCount"));
_activeSema = activateSema; _activateSema = activateSema;
if (_activateSema)
{
_taskCycleSema = new Semaphore(0, _waitingListMaxCount);
}
AcquireTime = acquireTime; AcquireTime = acquireTime;
} }
/// <inheritdoc /> /// <inheritdoc />
protected override void SendingMessageControlInner() protected override void SendingMessageControlInner()
{ {
if (_activeSema)
{
_taskCycleSema = new Semaphore(0, _waitingListMaxCount);
}
_taskCycleSema?.WaitOne(); _taskCycleSema?.WaitOne();
while (!_taskCancel) while (!_taskCancel)
{ {
@@ -112,6 +112,10 @@ namespace Modbus.Net
/// <inheritdoc /> /// <inheritdoc />
public override void SendStart() public override void SendStart()
{ {
if (_taskCycleSema == null && _activateSema)
{
_taskCycleSema = new Semaphore(0, _waitingListMaxCount);
}
_taskCancel = false; _taskCancel = false;
base.SendStart(); base.SendStart();
} }
@@ -146,6 +150,10 @@ namespace Modbus.Net
{ {
return false; return false;
} }
if (_taskCancel)
{
return false;
}
var success = base.AddMessageToList(def); var success = base.AddMessageToList(def);
if (success) if (success)
{ {