g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 删除不必要的锁操作

Browse Source
This commit is contained in:
Diego
2024-06-03 18:28:28 +08:00
parent c2d45349a4
commit 2ea2a662ef
6 changed files with 66 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ThingsGateway.Gateway.Application/HostService/Device/DeviceHostedService.cs
View File

@@ -88,10 +88,9 @@ public abstract class DeviceHostedService : BackgroundService
/// <returns>通道线程管理器</returns> /// <returns>通道线程管理器</returns>
protected ChannelThread GetChannelThread(DriverBase driverBase) protected ChannelThread GetChannelThread(DriverBase driverBase)
{ {
//lock (this) var channelId = driverBase.CurrentDevice.ChannelId;
lock (ChannelThreads)
{ {
long channelId = driverBase.CurrentDevice.ChannelId;
// 尝试从现有的通道线程管理器列表中查找匹配的通道线程 // 尝试从现有的通道线程管理器列表中查找匹配的通道线程
var channelThread = ChannelThreads.FirstOrDefault(t => t.ChannelId == channelId); var channelThread = ChannelThreads.FirstOrDefault(t => t.ChannelId == channelId);
if (channelThread != null) if (channelThread != null)
@@ -103,6 +102,7 @@ public abstract class DeviceHostedService : BackgroundService
// 如果未找到匹配的通道线程，则创建一个新的通道线程 // 如果未找到匹配的通道线程，则创建一个新的通道线程
return NewChannelThread(driverBase, channelId); return NewChannelThread(driverBase, channelId);
}
// 创建新的通道线程的内部方法 // 创建新的通道线程的内部方法
ChannelThread NewChannelThread(DriverBase driverBase, long channelId) ChannelThread NewChannelThread(DriverBase driverBase, long channelId)
@@ -141,7 +141,6 @@ public abstract class DeviceHostedService : BackgroundService
return channelThread; return channelThread;
} }
} }
}
/// <summary> /// <summary>
/// 删除所有通道线程，并释放资源（可选择同时移除相关设备） /// 删除所有通道线程，并释放资源（可选择同时移除相关设备）
@@ -179,8 +178,6 @@ public abstract class DeviceHostedService : BackgroundService
{ {
// 遍历通道线程列表，并在每个通道线程上执行 BeforeStopThread 方法 // 遍历通道线程列表，并在每个通道线程上执行 BeforeStopThread 方法
ChannelThreads.ParallelForEach((channelThread) => ChannelThreads.ParallelForEach((channelThread) =>
{
_ = Task.Run(() =>
{ {
try try
{ {
@@ -192,7 +189,6 @@ public abstract class DeviceHostedService : BackgroundService
_logger?.LogError(ex, channelThread.ToString()); _logger?.LogError(ex, channelThread.ToString());
} }
}); });
});
// 等待一小段时间，以确保 BeforeStopThread 方法有足够的时间执行 // 等待一小段时间，以确保 BeforeStopThread 方法有足够的时间执行
await Task.Delay(100).ConfigureAwait(false); await Task.Delay(100).ConfigureAwait(false);

18
src/ThingsGateway.Gateway.Application/Plugin/ChannelThread.cs
View File

@@ -422,24 +422,6 @@ public class ChannelThread
} }
} }
} }
// foreach (var cancellationToken in CancellationTokenSources)
//{
// _ = Task.Run(() =>
// {
// try
// {
// if (!cancellationToken.Value.IsCancellationRequested)// 检查是否已请求取消，若未请求取消则尝试取消操作
// {
// cancellationToken.Value?.Cancel();
// cancellationToken.Value?.Dispose();
// }
// }
// catch
// {
// // 捕获异常以确保不会影响其他令牌的取消操作
// }
// });
//}
} }
/// <summary> /// <summary>

28
src/ThingsGateway.Gateway.Application/Plugin/Collect/CollectBase.cs
View File

@@ -89,8 +89,8 @@ public abstract class CollectBase : DriverBase
{ {
try try
{ {
if (IsSingleThread) //if (IsSingleThread)
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); // await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
if (cancellationToken.IsCancellationRequested) if (cancellationToken.IsCancellationRequested)
throw new OperationCanceledException(); throw new OperationCanceledException();
@@ -111,8 +111,8 @@ public abstract class CollectBase : DriverBase
} }
finally finally
{ {
if (IsSingleThread) //if (IsSingleThread)
WriteLock.Release(); // WriteLock.Release();
} }
} }
@@ -125,8 +125,8 @@ public abstract class CollectBase : DriverBase
try try
{ {
// 如果是单线程模式，则等待写入锁 // 如果是单线程模式，则等待写入锁
if (IsSingleThread) //if (IsSingleThread)
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); // await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
// 检查协议是否为空，如果为空则抛出异常 // 检查协议是否为空，如果为空则抛出异常
if (Protocol == null) if (Protocol == null)
@@ -151,8 +151,8 @@ public abstract class CollectBase : DriverBase
finally finally
{ {
// 如果是单线程模式，则释放写入锁 // 如果是单线程模式，则释放写入锁
if (IsSingleThread) //if (IsSingleThread)
WriteLock.Release(); // WriteLock.Release();
} }
} }
@@ -263,7 +263,7 @@ public abstract class CollectBase : DriverBase
if (await TestOnline(cancellationToken)) if (await TestOnline(cancellationToken))
return; return;
if (CollectProperties.ConcurrentCount > 1 && !IsSingleThread) if (CollectProperties.ConcurrentCount > 1)
{ {
// 并行处理每个变量读取 // 并行处理每个变量读取
await CurrentDevice.VariableSourceReads.ParallelForEachAsync(async (variableSourceRead, cancellationToken) => await CurrentDevice.VariableSourceReads.ParallelForEachAsync(async (variableSourceRead, cancellationToken) =>
@@ -287,7 +287,7 @@ public abstract class CollectBase : DriverBase
} }
} }
if (CollectProperties.ConcurrentCount > 1 && !IsSingleThread) if (CollectProperties.ConcurrentCount > 1)
{ {
// 并行处理每个方法调用 // 并行处理每个方法调用
await CurrentDevice.ReadVariableMethods.ParallelForEachAsync(async (readVariableMethods, cancellationToken) => await CurrentDevice.ReadVariableMethods.ParallelForEachAsync(async (readVariableMethods, cancellationToken) =>
@@ -532,8 +532,8 @@ public abstract class CollectBase : DriverBase
try try
{ {
// 如果配置为单线程模式，则获取写入锁定 // 如果配置为单线程模式，则获取写入锁定
if (IsSingleThread) //if (IsSingleThread)
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); // await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
// 初始化操作结果 // 初始化操作结果
OperResult<object> result = new OperResult<object>(); OperResult<object> result = new OperResult<object>();
@@ -583,8 +583,8 @@ public abstract class CollectBase : DriverBase
finally finally
{ {
// 如果配置为单线程模式，则释放写入锁定 // 如果配置为单线程模式，则释放写入锁定
if (IsSingleThread) //if (IsSingleThread)
WriteLock.Release(); // WriteLock.Release();
} }
} }

7
src/ThingsGateway.Gateway.Application/Plugin/DriverBase.cs
View File

@@ -147,13 +147,6 @@ public abstract class DriverBase : DisposableObject
/// </summary> /// </summary>
public virtual bool IsCollectDevice => CurrentDevice.PluginType == PluginTypeEnum.Collect; public virtual bool IsCollectDevice => CurrentDevice.PluginType == PluginTypeEnum.Collect;
/// <summary>
/// 读写锁，通常对于主从协议来说都需要，返回false时，需要在底层实现读写锁
/// 并且读取或者写入会并发进行，需要另外在底层实现锁
/// </summary>
/// <returns></returns>
protected virtual bool IsSingleThread => Protocol?.IsSingleThread ?? true;
/// <summary> /// <summary>
/// 全局插件服务 /// 全局插件服务
/// </summary> /// </summary>

4
src/adapter/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs
View File

@@ -122,7 +122,6 @@ public class OpcDaMaster : CollectBase
{ {
try try
{ {
if (IsSingleThread)
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
_plc.ReadItemsWithGroup(deviceVariableSourceRead.RegisterAddress); _plc.ReadItemsWithGroup(deviceVariableSourceRead.RegisterAddress);
return OperResult.CreateSuccessResult(Array.Empty<byte>()); return OperResult.CreateSuccessResult(Array.Empty<byte>());
@@ -133,7 +132,6 @@ public class OpcDaMaster : CollectBase
} }
finally finally
{ {
if (IsSingleThread)
WriteLock.Release(); WriteLock.Release();
} }
} }
@@ -143,7 +141,6 @@ public class OpcDaMaster : CollectBase
{ {
try try
{ {
if (IsSingleThread)
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
var result = _plc.WriteItem(writeInfoLists.ToDictionary(a => a.Key.RegisterAddress!, a => a.Value.GetObjectFromJToken()!)); var result = _plc.WriteItem(writeInfoLists.ToDictionary(a => a.Key.RegisterAddress!, a => a.Value.GetObjectFromJToken()!));
return result.ToDictionary<KeyValuePair<string, Tuple<bool, string>>, string, OperResult>(a => return result.ToDictionary<KeyValuePair<string, Tuple<bool, string>>, string, OperResult>(a =>
@@ -160,7 +157,6 @@ public class OpcDaMaster : CollectBase
} }
finally finally
{ {
if (IsSingleThread)
WriteLock.Release(); WriteLock.Release();
} }
} }

12
src/adapter/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs
View File

@@ -51,14 +51,6 @@ public class OpcUaMaster : CollectBase
return $"{_driverProperties.OpcUrl}"; return $"{_driverProperties.OpcUrl}";
} }
protected override bool IsSingleThread
{
get
{
return true;
}
}
/// <inheritdoc/> /// <inheritdoc/>
public override void Init(IChannel? channel = null) public override void Init(IChannel? channel = null)
{ {
@@ -146,7 +138,6 @@ public class OpcUaMaster : CollectBase
{ {
try try
{ {
if (IsSingleThread)
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
var result = await _plc.ReadJTokenValueAsync(deviceVariableSourceRead.VariableRunTimes.Where(a => !a.RegisterAddress.IsNullOrEmpty()).Select(a => a.RegisterAddress!).ToArray(), cancellationToken).ConfigureAwait(false); var result = await _plc.ReadJTokenValueAsync(deviceVariableSourceRead.VariableRunTimes.Where(a => !a.RegisterAddress.IsNullOrEmpty()).Select(a => a.RegisterAddress!).ToArray(), cancellationToken).ConfigureAwait(false);
foreach (var data in result) foreach (var data in result)
@@ -197,7 +188,6 @@ public class OpcUaMaster : CollectBase
} }
finally finally
{ {
if (IsSingleThread)
WriteLock.Release(); WriteLock.Release();
} }
} }
@@ -207,7 +197,6 @@ public class OpcUaMaster : CollectBase
{ {
try try
{ {
if (IsSingleThread)
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
var result = await _plc.WriteNodeAsync(writeInfoLists.ToDictionary(a => a.Key.RegisterAddress!, a => a.Value), cancellationToken).ConfigureAwait(false); var result = await _plc.WriteNodeAsync(writeInfoLists.ToDictionary(a => a.Key.RegisterAddress!, a => a.Value), cancellationToken).ConfigureAwait(false);
return result.ToDictionary<KeyValuePair<string, Tuple<bool, string>>, string, OperResult>(a => return result.ToDictionary<KeyValuePair<string, Tuple<bool, string>>, string, OperResult>(a =>
@@ -224,7 +213,6 @@ public class OpcUaMaster : CollectBase
} }
finally finally
{ {
if (IsSingleThread)
WriteLock.Release(); WriteLock.Release();
} }
} }