Faster locking through .NET 9's System.Threading.Lock

Author: MarkCiliaVincenti

Directory.Packages.props

@@ -8,6 +8,7 @@
     <ExtensionPackageVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0.0-preview.6.24327.7</ExtensionPackageVersion>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="Backport.System.Threading.Lock" Version="1.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(ExtensionPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(ExtensionPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
@@ -33,12 +34,12 @@
   <ItemGroup>
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.7" />    
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.7" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="Dapper" Version="2.1.44" />
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="PolySharp" Version="1.14.1" />
   </ItemGroup>
-</Project>
+</Project>

src/WeihanLi.Common.Logging.Serilog/SerilogHelper.cs

@@ -4,7 +4,7 @@ namespace WeihanLi.Common.Logging.Serilog;
 
 public static class SerilogHelper
 {
-    private static readonly object Locker = new();
+    private static readonly Lock Locker = new();
 
     public static void LogInit(Action<LoggerConfiguration> configureAction)
     {

src/WeihanLi.Common.Logging.Serilog/WeihanLi.Common.Logging.Serilog.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net9.0</TargetFrameworks>
     <PackageProjectUrl>https://github.com/WeihanLi/WeihanLi.Common/tree/dev/src/WeihanLi.Common.Logging.Serilog</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>$(PackageTags);logging;serilog</PackageTags>
@@ -10,6 +10,7 @@
     <PackageReleaseNotes>
       https://github.com/WeihanLi/WeihanLi.Common/blob/dev/docs/ReleaseNotes.md
     </PackageReleaseNotes>
+    <LangVersion>Preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Serilog" />

src/WeihanLi.Common/Aspect/ProxyUtils.cs

@@ -17,7 +17,7 @@ internal static class ProxyUtils
     private static readonly Dictionary<string, Type> _proxyTypes = [];
 
     private const string TargetFieldName = "__target";
-    private static readonly object _typeLock = new();
+    private static readonly Lock _typeLock = new();
 
     private static readonly Func<Type, Type?, string> _proxyTypeNameResolver;
 

src/WeihanLi.Common/DependencyResolver.cs

@@ -10,7 +10,7 @@ namespace WeihanLi.Common;
 /// </summary>
 public static class DependencyResolver
 {
-    private static readonly object _lock = new();
+    private static readonly Lock _lock = new();
     public static IDependencyResolver Current { get; private set; } = new DefaultDependencyResolver();
 
     public static TService? ResolveService<TService>() => Current.ResolveService<TService>();

src/WeihanLi.Common/Helpers/InvokeHelper.cs

@@ -96,7 +96,7 @@ public static async Task<double> ProfileAsync<T1, T2, T3>(Func<T1, T2, T3, Task>
 
     public static Action<Exception>? OnInvokeException { get; set; }
 
-    private static readonly object _exitLock = new();
+    private static readonly Lock _exitLock = new();
     private static volatile bool _exited;
     private static readonly Lazy<CancellationTokenSource> LazyCancellationTokenSource = new();
     private static void InvokeExitHandler(object? sender, EventArgs? args)

src/WeihanLi.Common/Helpers/PeriodBatching/PeriodicBatching.cs

@@ -32,7 +32,7 @@ public abstract class PeriodicBatching<TEvent> : IDisposable where TEvent : clas
     private readonly BoundedConcurrentQueue<TEvent> _queue;
     private readonly BatchedConnectionStatus _status;
     private readonly Queue<TEvent> _waitingBatch = new();
-    private readonly object _stateLock = new();
+    private readonly Lock _stateLock = new();
     private readonly PortableTimer _timer;
     private bool _unloading;
     private bool _started;

src/WeihanLi.Common/Helpers/PeriodBatching/PortableTimer.cs

@@ -18,7 +18,7 @@ namespace WeihanLi.Common.Helpers.PeriodBatching;
 
 internal sealed class PortableTimer : IDisposable
 {
-    private readonly object _stateLock = new();
+    private readonly Lock _stateLock = new();
     private readonly Func<CancellationToken, Task> _onTick;
     private readonly CancellationTokenSource _cancel = new();
     private readonly Timer _timer;

src/WeihanLi.Common/WeihanLi.Common.csproj

@@ -8,6 +8,7 @@
     <PackageSummary>common libarary,extensions helpers and useful utilities</PackageSummary>
     <PackageProjectUrl>https://github.com/WeihanLi/WeihanLi.Common/tree/dev/src/WeihanLi.Common</PackageProjectUrl>
     <NoWarn>$(NoWarn);1591;DE0003;SYSLIB0014;</NoWarn>
+    <LangVersion>Preview</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -23,6 +24,9 @@
     <PackageReference Include="System.ComponentModel.Annotations" />
     <PackageReference Include="Microsoft.CSharp" PrivateAssets="All" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Backport.System.Threading.Lock" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Logging" />