Skip redundant dispose checks

dotnet · Oct 15, 2024 · a8e9ede · a8e9ede
1 parent 0252f0f
commit a8e9ede
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/DotNext.Threading/Threading/AsyncExclusiveLock.cs b/src/DotNext.Threading/Threading/AsyncExclusiveLock.cs
@@ -86,6 +86,11 @@ private void OnCompleted(DefaultWaitNode node)
     public bool TryAcquire()
     {
         ObjectDisposedException.ThrowIf(IsDisposed, this);
+        return TryAcquireCore();
+    }
+
+    private bool TryAcquireCore()
+    {
         Monitor.Enter(SyncRoot);
         var result = TryAcquire(ref manager);
         Monitor.Exit(SyncRoot);
@@ -104,7 +109,7 @@ public bool TryAcquire()
     public bool TryAcquire(TimeSpan timeout)
     {
         ObjectDisposedException.ThrowIf(IsDisposed, this);
-        return timeout == TimeSpan.Zero ? TryAcquire() : TryAcquire(new Timeout(timeout), ref manager);
+        return timeout == TimeSpan.Zero ? TryAcquireCore() : TryAcquire(new Timeout(timeout), ref manager);
     }
 
     /// <summary>

diff --git a/src/DotNext.Threading/Threading/AsyncReaderWriterLock.cs b/src/DotNext.Threading/Threading/AsyncReaderWriterLock.cs
@@ -284,8 +284,12 @@ public LockStamp TryOptimisticRead()
     /// </summary>
     /// <returns><see langword="true"/> if lock is taken successfully; otherwise, <see langword="false"/>.</returns>
     /// <exception cref="ObjectDisposedException">This object has been disposed.</exception>
-    public bool TryEnterReadLock() => TryEnter<ReadLockManager>();
-
+    public bool TryEnterReadLock()
+    {
+        ObjectDisposedException.ThrowIf(IsDisposed, this);
+        return TryEnter<ReadLockManager>();
+    }
+
     /// <summary>
     /// Tries to obtain reader lock synchronously.
     /// </summary>
@@ -365,8 +369,12 @@ public bool TryEnterWriteLock(in LockStamp stamp)
     /// </summary>
     /// <returns><see langword="true"/> if lock is taken successfully; otherwise, <see langword="false"/>.</returns>
     /// <exception cref="ObjectDisposedException">This object has been disposed.</exception>
-    public bool TryEnterWriteLock() => TryEnter<WriteLockManager>();
-
+    public bool TryEnterWriteLock()
+    {
+        ObjectDisposedException.ThrowIf(IsDisposed, this);
+        return TryEnter<WriteLockManager>();
+    }
+
     /// <summary>
     /// Tries to obtain writer lock synchronously.
     /// </summary>
@@ -425,13 +433,15 @@ public ValueTask EnterWriteLockAsync(TimeSpan timeout, CancellationToken token =
     /// </summary>
     /// <returns><see langword="true"/> if lock is taken successfully; otherwise, <see langword="false"/>.</returns>
     /// <exception cref="ObjectDisposedException">This object has been disposed.</exception>
-    public bool TryUpgradeToWriteLock() => TryEnter<UpgradeManager>();
+    public bool TryUpgradeToWriteLock()
+    {
+        ObjectDisposedException.ThrowIf(IsDisposed, this);
+        return TryEnter<UpgradeManager>();
+    }
 
     private bool TryEnter<TLockManager>()
         where TLockManager : struct, ILockManager<WaitNode>
     {
-        ObjectDisposedException.ThrowIf(IsDisposed, this);
-
         Monitor.Enter(SyncRoot);
         var result = TryAcquire(ref GetLockManager<TLockManager>());
         Monitor.Exit(SyncRoot);