Use System.Threading.Lock in Kestrel (#57236)

Author: ladeak

src/Servers/Kestrel/Core/src/Internal/CertificatePathWatcher.cs

@@ -17,7 +17,7 @@ internal sealed partial class CertificatePathWatcher : IDisposable
     private readonly string _contentRootDir;
     private readonly ILogger<CertificatePathWatcher> _logger;
 
-    private readonly object _metadataLock = new();
+    private readonly Lock _metadataLock = new();
 
     /// <remarks>Acquire <see cref="_metadataLock"/> before accessing.</remarks>
     private readonly Dictionary<string, DirectoryWatchMetadata> _metadataForDirectory = new();

src/Servers/Kestrel/Core/src/Internal/Http/Http1OutputProducer.cs

@@ -34,7 +34,7 @@ internal class Http1OutputProducer : IHttpOutputProducer, IDisposable
     private readonly TimingPipeFlusher _flusher;
 
     // This locks access to all of the below fields
-    private readonly object _contextLock = new object();
+    private readonly Lock _contextLock = new();
 
     private bool _pipeWriterCompleted;
     private bool _aborted;

src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs

@@ -43,7 +43,7 @@ internal abstract partial class HttpProtocol : IHttpResponseControl
     private Stack<KeyValuePair<Func<object, Task>, object>>? _onStarting;
     private Stack<KeyValuePair<Func<object, Task>, object>>? _onCompleted;
 
-    private readonly object _abortLock = new object();
+    private readonly Lock _abortLock = new();
     protected volatile bool _connectionAborted;
     private bool _preventRequestAbortedCancellation;
     private CancellationTokenSource? _abortedCts;

src/Servers/Kestrel/Core/src/Internal/Http2/FlowControl/InputFlowControl.cs

@@ -25,7 +25,7 @@ internal sealed class InputFlowControl
     private FlowControl _flow;
     private int _pendingUpdateSize;
     private bool _windowUpdatesDisabled;
-    private readonly object _flowLock = new object();
+    private readonly Lock _flowLock = new();
 
     public InputFlowControl(uint initialWindowSize, uint minWindowSizeIncrement)
     {

src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs

@@ -71,7 +71,7 @@ internal sealed class Http2FrameWriter
 
     private bool IsFlowControlQueueLimitEnabled => _maximumFlowControlQueueSize > 0;
 
-    private readonly object _writeLock = new object();
+    private readonly Lock _writeLock = new();
     private readonly Http2Frame _outgoingFrame;
     private readonly Http2HeadersEnumerator _headersEnumerator = new Http2HeadersEnumerator();
     private readonly ConcurrentPipeWriter _outputWriter;
@@ -99,7 +99,7 @@ internal sealed class Http2FrameWriter
     private bool _completed;
     private bool _aborted;
 
-    private readonly object _windowUpdateLock = new();
+    private readonly Lock _windowUpdateLock = new();
     private long _connectionWindow;
     private readonly Queue<Http2OutputProducer> _waitingForMoreConnectionWindow = new();
     // This is the stream that consumed the last set of connection window

src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs

@@ -28,7 +28,7 @@ internal sealed class Http2OutputProducer : IHttpOutputProducer, IHttpOutputAbor
 
     private readonly MemoryPool<byte> _memoryPool;
     private readonly Http2Stream _stream;
-    private readonly object _dataWriterLock = new object();
+    private readonly Lock _dataWriterLock = new();
     private readonly Pipe _pipe;
     private readonly ConcurrentPipeWriter _pipeWriter;
     private readonly PipeReader _pipeReader;
@@ -599,7 +599,7 @@ public void Reset()
 
     internal void OnRequestProcessingEnded()
     {
-        var shouldCompleteStream = false;
+        bool shouldCompleteStream;
         lock (_dataWriterLock)
         {
             if (_requestProcessingComplete)
@@ -625,7 +625,7 @@ internal void OnRequestProcessingEnded()
 
     internal ValueTask<FlushResult> CompleteResponseAsync()
     {
-        var shouldCompleteStream = false;
+        bool shouldCompleteStream;
         ValueTask<FlushResult> task = default;
 
         lock (_dataWriterLock)
@@ -705,8 +705,7 @@ internal Memory<byte> GetFakeMemory(int minSize)
 
     public bool TryUpdateStreamWindow(int bytes)
     {
-        var schedule = false;
-
+        bool schedule;
         lock (_dataWriterLock)
         {
             var maxUpdate = Http2PeerSettings.MaxWindowSize - _streamWindow;

src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs

@@ -44,7 +44,7 @@ internal abstract partial class Http2Stream : HttpProtocol, IThreadPoolWorkItem,
     internal long DrainExpirationTimestamp { get; set; }
 
     private StreamCompletionFlags _completionState;
-    private readonly object _completionLock = new object();
+    private readonly Lock _completionLock = new();
 
     public void Initialize(Http2StreamContext context)
     {

src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs

@@ -35,9 +35,9 @@ internal sealed class Http3Connection : IHttp3StreamLifetimeHandler, IRequestPro
     // so start highest opened request stream ID at -4.
     private const long DefaultHighestOpenedRequestStreamId = -4;
 
-    private readonly object _sync = new();
+    private readonly Lock _sync = new();
     private readonly HttpMultiplexedConnectionContext _context;
-    private readonly object _protocolSelectionLock = new();
+    private readonly Lock _protocolSelectionLock = new();
     private readonly StreamCloseAwaitable _streamCompletionAwaitable = new();
     private readonly IProtocolErrorCodeFeature _errorCodeFeature;
     private readonly Dictionary<long, WebTransportSession>? _webtransportSessions;

src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs

@@ -28,7 +28,7 @@ internal abstract class Http3ControlStream : IHttp3Stream, IThreadPoolWorkItem
     private readonly Http3RawFrame _incomingFrame = new Http3RawFrame();
     private volatile int _isClosed;
     private long _headerType;
-    private readonly object _completionLock = new();
+    private readonly Lock _completionLock = new();
 
     private bool _haveReceivedSettingsFrame;
     private StreamCompletionFlags _completionState;

src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameWriter.cs

@@ -29,7 +29,7 @@ internal sealed class Http3FrameWriter
     private const int MaxDataFrameSize = 16 * 1024;
     private const int HeaderBufferSize = 16 * 1024;
 
-    private readonly object _writeLock = new object();
+    private readonly Lock _writeLock = new();
 
     private readonly int _maxTotalHeaderSize;
     private readonly ConnectionContext _connectionContext;