Merge pull request #46 from MarkCiliaVincenti/net9locking

Improved .NET 9.0+ performance through System.Threading.Lock

src/Directory.Build.props

@@ -66,8 +66,16 @@
 		<DefineConstants>ValueTask;Unsafe;SystemNetHttp;SystemMemory;SystemTextJson;AsyncEnumerable;DisposeAsync;DefaultInterfaceMethods</DefineConstants>
 	</PropertyGroup>
 
-
+<ItemGroup Condition="!$(DefineConstants.Contains('SourceGenerator'))">
+		<PackageReference Include="Backport.System.Threading.Lock" Version="3.0.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>analyzers</IncludeAssets>
+		</PackageReference>
+		<Using Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Alias="Lock" Include="System.Threading.Lock" />
+		<Using Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Alias="Lock" Include="Backport.System.Threading.Lock" />
+		<Using Alias="LockFactory" Include="Backport.System.Threading.LockFactory" />
+	</ItemGroup>
 	<Target Name="CopyNuGetPackage" AfterTargets="Pack" Condition="'$(Configuration)' == 'Release'">
 		<Copy SourceFiles="$(PackageOutputPath)\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="D:\Nuget\local" />
 	</Target>
-</Project>
+</Project>

src/TouchSocket.AspNetCore/Dmtp/Components/WebSocketDmtpSessionClient.cs

@@ -58,7 +58,7 @@ public WebSocketDmtpSessionClient()
         private WebSocketDmtpService m_service;
         private HttpContext m_httpContext;
         private string m_id;
-        private readonly object m_locker = new object();
+        private readonly Lock m_locker = LockFactory.Create();
 
         #endregion 字段
 

src/TouchSocket.Core.SourceGenerator/TouchSocket.Core.SourceGenerator.csproj

@@ -2,13 +2,13 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<LangVersion>9.0</LangVersion>
 		<NoPackageAnalysis>true</NoPackageAnalysis>
 		<ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
 		<BaseOutputPath>bin</BaseOutputPath>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
 		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 		<SignAssembly>false</SignAssembly>
+		<DefineConstants>SourceGenerator</DefineConstants>
 	</PropertyGroup>
 
 	<ItemGroup>

src/TouchSocket.Core/Collections/Concurrent/IntelligentDataQueue.cs

@@ -98,6 +98,7 @@ public class IntelligentDataQueue<T> : ConcurrentQueue<T> where T : IQueueData
     {
         private long m_actualSize;
         private long m_maxSize;
+        private Lock m_lock = LockFactory.Create();
 
         /// <summary>
         /// 智能数据安全队列
@@ -175,7 +176,7 @@ public void Clear(Action<T> onClear)
         /// <param name="item"></param>
         public new void Enqueue(T item)
         {
-            lock (this)
+            lock (m_lock)
             {
                 var free = this.m_actualSize < this.m_maxSize;
                 if (this.Free != free)

src/TouchSocket.Core/Core/SnowflakeIDGenerator.cs

@@ -42,6 +42,8 @@ public class SnowflakeIdGenerator
 
         private long m_lastTimestamp = -1L;
 
+        private Lock m_lock = LockFactory.Create();
+
         static SnowflakeIdGenerator()
         {
         }
@@ -82,7 +84,7 @@ public SnowflakeIdGenerator(long workerId)
         /// <returns></returns>
         public long NextId()
         {
-            lock (this)
+            lock (m_lock)
             {
                 var timestamp = this.TimeGen();
                 if (this.m_lastTimestamp == timestamp)

src/TouchSocket.Core/IO/FileIO/FilePool.cs

@@ -26,7 +26,7 @@ namespace TouchSocket.Core
 
     public static partial class FilePool
     {
-        private static readonly object s_locker = new object();
+        private static readonly Lock s_locker = LockFactory.Create();
 
         private static readonly ConcurrentDictionary<string, FileStorage> m_pathStorage = new ConcurrentDictionary<string, FileStorage>();
 

src/TouchSocket.Core/IO/FileIO/FileStorageWriter.cs

@@ -21,7 +21,7 @@ namespace TouchSocket.Core
     public partial class FileStorageWriter : SafetyDisposableObject
     {
         private long m_position;
-
+        internal Lock m_lock = LockFactory.Create();
 
         /// <summary>
         /// 初始化FileStorageWriter的实例。

src/TouchSocket.Core/Logger/ConsoleLogger.cs

@@ -19,6 +19,8 @@ namespace TouchSocket.Core
     /// </summary>
     public sealed class ConsoleLogger : LoggerBase
     {
+        private static readonly Lock m_lock = LockFactory.Create();
+
         static ConsoleLogger()
         {
             Default = new ConsoleLogger();
@@ -46,7 +48,7 @@ private ConsoleLogger()
         /// <param name="exception"></param>
         protected override void WriteLog(LogLevel logLevel, object source, string message, Exception exception)
         {
-            lock (typeof(ConsoleLogger))
+            lock (m_lock)
             {
                 Console.Write(DateTime.Now.ToString(this.DateTimeFormat));
                 Console.Write(" | ");

src/TouchSocket.Core/Logger/FileLogger.cs

@@ -160,7 +160,7 @@ private void WriteLogStringToFile(string logString, LogLevel logLevel)
 
             var writer = this.GetFileStorageWriter(dirPath);
 
-            lock (writer)
+            lock (writer.m_lock)
             {
                 try
                 {

src/TouchSocket.Core/Plugins/PluginManager.cs

@@ -25,7 +25,7 @@ namespace TouchSocket.Core
     /// </summary>
     public sealed class PluginManager : DisposableObject, IPluginManager
     {
-        private readonly object m_locker = new object();
+        private readonly Lock m_locker = LockFactory.Create();
         private readonly IScopedResolver m_scopedResolver;
         private Dictionary<Type, PluginInvokeLine> m_pluginMethods = new Dictionary<Type, PluginInvokeLine>();
 

src/TouchSocket.Core/Threading/AsyncResetEvent.cs

@@ -25,7 +25,7 @@ public class AsyncResetEvent : DisposableObject
     {
         private readonly bool m_autoReset;
 
-        private readonly object m_locker = new object();
+        private readonly Lock m_locker = LockFactory.Create();
 
         private readonly Queue<TaskCompletionSource<bool>> m_waitQueue = new Queue<TaskCompletionSource<bool>>();
 

src/TouchSocket.NamedPipe/Components/NamedPipeClientBase.cs

@@ -52,7 +52,7 @@ public NamedPipeClientBase()
         private ValueCounter m_receiveCounter;
         private InternalReceiver m_receiver;
         private SingleStreamDataHandlingAdapter m_dataHandlingAdapter;
-        private readonly object m_lockForAbort = new object();
+        private readonly Lock m_lockForAbort = LockFactory.Create();
         #endregion 变量
 
         #region 事件

src/TouchSocket.NamedPipe/Components/NamedPipeSessionClientBase.cs

@@ -30,9 +30,8 @@ namespace TouchSocket.NamedPipe
     public abstract class NamedPipeSessionClientBase : ResolverConfigObject, INamedPipeSession, INamedPipeListenableClient, IIdClient
     {
         #region 字段
-
-        private readonly object m_lockForAbort = new object();
         private readonly SemaphoreSlim m_semaphoreSlimForSend = new SemaphoreSlim(1, 1);
+        private readonly Lock m_lockForAbort = LockFactory.Create();
         private TouchSocketConfig m_config;
         private SingleStreamDataHandlingAdapter m_dataHandlingAdapter;
         private NamedPipeListenOption m_listenOption;

src/TouchSocket.Rpc.SourceGenerator/TouchSocket.Rpc.SourceGenerator.csproj

@@ -2,13 +2,13 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<LangVersion>9.0</LangVersion>
 		<NoPackageAnalysis>true</NoPackageAnalysis>
 		<ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
 		<BaseOutputPath>bin</BaseOutputPath>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
 		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 		<SignAssembly>false</SignAssembly>
+		<DefineConstants>SourceGenerator</DefineConstants>
 	</PropertyGroup>
 
 	<ItemGroup>

src/TouchSocket.Rpc/Common/CallContext.cs

@@ -20,8 +20,8 @@ namespace TouchSocket.Rpc
     /// </summary>
     public abstract class CallContext : DependencyObject, ICallContext
     {
-        private readonly object m_locker = new object();
         private bool m_canceled;
+        private readonly Lock m_locker = LockFactory.Create();
         private CancellationTokenSource m_tokenSource;
 
         /// <summary>

src/TouchSocket.SerialPorts/Components/SerialPortClientBase.cs

@@ -36,7 +36,7 @@ public SerialPortClientBase()
 
         #region 变量
 
-        private readonly object m_lockForAbort = new object();
+        private readonly Lock m_lockForAbort = LockFactory.Create();
         private readonly SemaphoreSlim m_semaphoreForConnect = new SemaphoreSlim(1, 1);
         private SingleStreamDataHandlingAdapter m_dataHandlingAdapter;
         private bool m_online;

src/TouchSocket.WebApi/Plugins/WebApiParserPlugin.cs

@@ -27,6 +27,7 @@ namespace TouchSocket.WebApi
     [PluginOption(Singleton = true)]
     public class WebApiParserPlugin : PluginBase, IHttpPlugin
     {
+        private readonly Lock m_locker = LockFactory.Create();
         private readonly Dictionary<RpcParameter, WebApiParameterInfo> m_pairsForParameterInfo = new Dictionary<RpcParameter, WebApiParameterInfo>();
         private readonly IRpcServerProvider m_rpcServerProvider;
 
@@ -89,7 +90,7 @@ private WebApiParameterInfo GetParameterInfo(RpcParameter parameter)
                 return webApiParameterInfo;
             }
 
-            lock (this.m_pairsForParameterInfo)
+            lock (this.m_locker)
             {
                 if (!m_pairsForParameterInfo.ContainsKey(parameter))
                 {

src/TouchSocket/Components/Tcp/TcpClientBase.cs

@@ -39,7 +39,7 @@ public TcpClientBase()
 
         #region 变量
 
-        private readonly object m_lockForAbort = new object();
+        private readonly Lock m_lockForAbort = LockFactory.Create();
         private readonly SemaphoreSlim m_semaphoreForConnect = new SemaphoreSlim(1, 1);
         private readonly TcpCore m_tcpCore = new TcpCore();
         private Task m_beginReceiveTask;

src/TouchSocket/Components/Tcp/TcpSessionClientBase.cs

@@ -50,7 +50,7 @@ protected TcpSessionClientBase()
 
         #region 变量
 
-        private readonly object m_lockForAbort = new object();
+        private readonly Lock m_lockForAbort = LockFactory.Create();
         private Task m_beginReceiveTask;
         private SingleStreamDataHandlingAdapter m_dataHandlingAdapter;
         private string m_id;