Performance improvement for .NET 9.0+

MarkCiliaVincenti · MarkCiliaVincenti · commit 0bb3f89dc13d · 2024-08-11T19:46:33.000+02:00
diff --git a/bus/EasyCaching.Bus.Zookeeper/DefaultZookeeperBus.cs b/bus/EasyCaching.Bus.Zookeeper/DefaultZookeeperBus.cs
@@ -41,7 +41,7 @@ public class DefaultZookeeperBus : EasyCachingAbstractBus
         /// <summary>
         /// lock
         /// </summary>
-        private readonly object _zkEventLock = new object();
+        private readonly Lock _zkEventLock = new Lock();
 
         /// <summary>
         /// The serializer.
@@ -214,7 +214,7 @@ private async Task SubscribeDataChange(WatchedEvent @event)
         /// <returns></returns>
         private async Task ReZkConnect()
         {
-            if (!Monitor.TryEnter(_zkEventLock, _zkBusOptions.ConnectionTimeout))
+            if (!_zkEventLock.TryEnter(_zkBusOptions.ConnectionTimeout))
                 return;
             try
             {
@@ -234,7 +234,7 @@ private async Task ReZkConnect()
             }
             finally
             {
-                Monitor.Exit(_zkEventLock);
+                _zkEventLock.Exit();
             }
         }
 
diff --git a/bus/EasyCaching.Bus.Zookeeper/EasyCaching.Bus.Zookeeper.csproj b/bus/EasyCaching.Bus.Zookeeper/EasyCaching.Bus.Zookeeper.csproj
@@ -3,7 +3,7 @@
 	<Import Project="../../build/version.props" />
 	<Import Project="../../build/releasenotes.props" />
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net6.0;net9.0</TargetFrameworks>
 		<Owners>ncc;Catcher Wong</Owners>
 		<Authors>ncc;Catcher Wong</Authors>
 		<VersionPrefix>$(EasyCachingZookeeperBusPackageVersion)</VersionPrefix>
diff --git a/src/EasyCaching.Core/DistributedLock/DistributedLock.cs b/src/EasyCaching.Core/DistributedLock/DistributedLock.cs
@@ -9,7 +9,7 @@ namespace EasyCaching.Core.DistributedLock
     public class DistributedLock : MemoryLock
     {
         private readonly IDistributedLockProvider _provider;
-        private readonly object _syncObj = new object();
+        private readonly Lock _syncObj = new Lock();
         private readonly DistributedLockOptions _options;
         private readonly ILogger _logger;
 
diff --git a/src/EasyCaching.Core/DistributedLock/MemoryLock.cs b/src/EasyCaching.Core/DistributedLock/MemoryLock.cs
@@ -16,7 +16,7 @@ public class MemoryLock : IDistributedLock
 
         public string Key { get; }
 
-        private readonly object _syncObj = new object();
+        private readonly Lock _syncObj = new Lock();
 
         public MemoryLock(string key) => Key = key;
 
diff --git a/src/EasyCaching.Core/DistributedLock/RefCounter.cs b/src/EasyCaching.Core/DistributedLock/RefCounter.cs
diff --git a/src/EasyCaching.Core/EasyCaching.Core.csproj b/src/EasyCaching.Core/EasyCaching.Core.csproj
@@ -2,7 +2,8 @@
 	<Import Project="../../build/version.props" />
 	<Import Project="../../build/releasenotes.props" />
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net6.0;net9.0</TargetFrameworks>
+		<LangVersion>Preview</LangVersion>
 		<Owners>ncc;Catcher Wong</Owners>
 		<Authors>ncc;Catcher Wong</Authors>
 		<VersionPrefix>$(EasyCachingCorePackageVersion)</VersionPrefix>
@@ -36,12 +37,20 @@
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
 		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.7.0" />
+		<PackageReference Include="Backport.System.Threading.Lock" Version="1.0.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
 		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+		<PackageReference Include="Backport.System.Threading.Lock" Version="1.0.1" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class DefaultZookeeperBus : EasyCachingAbstractBus`
`41`	`41`	`/// <summary>`
`42`	`42`	`/// lock`
`43`	`43`	`/// </summary>`
`44`		`- private readonly object _zkEventLock = new object();`
	`44`	`+ private readonly Lock _zkEventLock = new Lock();`
`45`	`45`
`46`	`46`	`/// <summary>`
`47`	`47`	`/// The serializer.`
`@@ -214,7 +214,7 @@ private async Task SubscribeDataChange(WatchedEvent @event)`
`214`	`214`	`/// <returns></returns>`
`215`	`215`	`private async Task ReZkConnect()`
`216`	`216`	`{`
`217`		`- if (!Monitor.TryEnter(_zkEventLock, _zkBusOptions.ConnectionTimeout))`
	`217`	`+ if (!_zkEventLock.TryEnter(_zkBusOptions.ConnectionTimeout))`
`218`	`218`	`return;`
`219`	`219`	`try`
`220`	`220`	`{`
`@@ -234,7 +234,7 @@ private async Task ReZkConnect()`
`234`	`234`	`}`
`235`	`235`	`finally`
`236`	`236`	`{`
`237`		`- Monitor.Exit(_zkEventLock);`
	`237`	`+ _zkEventLock.Exit();`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace EasyCaching.Core.DistributedLock`
`9`	`9`	`public class DistributedLock : MemoryLock`
`10`	`10`	`{`
`11`	`11`	`private readonly IDistributedLockProvider _provider;`
`12`		`- private readonly object _syncObj = new object();`
	`12`	`+ private readonly Lock _syncObj = new Lock();`
`13`	`13`	`private readonly DistributedLockOptions _options;`
`14`	`14`	`private readonly ILogger _logger;`
`15`	`15`