Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Recover ReentrantSemaphore after JTF throws an exception #844

Merged
merged 3 commits into from May 5, 2021
Merged

Recover ReentrantSemaphore after JTF throws an exception #844

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a5e278
Recover ReentrantSemaphore after JTF throws an exception
AArnott May 4, 2021
a7b2a04
Expand `try` blocks in `ReentrantSemaphore` even further
AArnott May 4, 2021
9f2c0e3
Merge remote-tracking branch 'upstream/v16.10' into improveSemaphoreR…
AArnott May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
220 changes: 110 additions & 110 deletions src/Microsoft.VisualStudio.Threading/ReentrantSemaphore.cs
View file
Open in desktop
Expand Up @@ -352,9 +352,9 @@ public override async Task ExecuteAsync(Func<Task> operation, CancellationToken
}
}

await this.ExecuteCoreAsync(async delegate
try
AArnott marked this conversation as resolved.
Show resolved Hide resolved
{
try
await this.ExecuteCoreAsync(async delegate
{
if (this.IsJoinableTaskAware(out JoinableTaskFactory? joinableTaskFactory, out _))
{
Expand All @@ -376,12 +376,12 @@ public override async Task ExecuteAsync(Func<Task> operation, CancellationToken
}

await operation().ConfigureAwaitRunInline();
}
finally
{
DisposeReleaserNoThrow(releaser);
}
});
});
}
finally
{
DisposeReleaserNoThrow(releaser);
}
}

/// <inheritdoc />
Expand Down Expand Up @@ -416,9 +416,9 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
}
}

return await this.ExecuteCoreAsync(async delegate
try
{
try
return await this.ExecuteCoreAsync(async delegate
{
if (this.IsJoinableTaskAware(out JoinableTaskFactory? joinableTaskFactory, out _))
{
Expand All @@ -440,12 +440,12 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
}

return await operation().ConfigureAwait(true);
}
finally
{
DisposeReleaserNoThrow(releaser);
}
});
});
}
finally
{
DisposeReleaserNoThrow(releaser);
}
}
}

Expand Down Expand Up @@ -515,9 +515,9 @@ public override async Task ExecuteAsync(Func<Task> operation, CancellationToken
}
}

await this.ExecuteCoreAsync(async delegate
try
{
try
await this.ExecuteCoreAsync(async delegate
{
if (this.IsJoinableTaskAware(out JoinableTaskFactory? joinableTaskFactory, out _))
{
Expand All @@ -540,19 +540,19 @@ public override async Task ExecuteAsync(Func<Task> operation, CancellationToken

this.reentrancyDetection.Value = ownedBox = new StrongBox<bool>(true);
await operation().ConfigureAwaitRunInline();
}
finally
});
}
finally
{
// Make it clear to any forks of our ExecutionContexxt that the semaphore is no longer owned.
// Null check incase the switch to UI thread was cancelled.
if (ownedBox is object)
{
// Make it clear to any forks of our ExecutionContexxt that the semaphore is no longer owned.
// Null check incase the switch to UI thread was cancelled.
if (ownedBox is object)
{
ownedBox.Value = false;
}

DisposeReleaserNoThrow(releaser);
ownedBox.Value = false;
}
});

DisposeReleaserNoThrow(releaser);
}
}

/// <inheritdoc />
Expand Down Expand Up @@ -594,9 +594,9 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
}
}

return await this.ExecuteCoreAsync(async delegate
try
{
try
return await this.ExecuteCoreAsync(async delegate
{
if (this.IsJoinableTaskAware(out JoinableTaskFactory? joinableTaskFactory, out _))
{
Expand All @@ -619,19 +619,19 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,

this.reentrancyDetection.Value = ownedBox = new StrongBox<bool>(true);
return await operation().ConfigureAwait(true);
}
finally
});
}
finally
{
// Make it clear to any forks of our ExecutionContexxt that the semaphore is no longer owned.
// Null check incase the switch to UI thread was cancelled.
if (ownedBox is object)
{
// Make it clear to any forks of our ExecutionContexxt that the semaphore is no longer owned.
// Null check incase the switch to UI thread was cancelled.
if (ownedBox is object)
{
ownedBox.Value = false;
}

DisposeReleaserNoThrow(releaser);
ownedBox.Value = false;
}
});

DisposeReleaserNoThrow(releaser);
}
}

/// <inheritdoc />
Expand Down Expand Up @@ -725,11 +725,11 @@ public override async Task ExecuteAsync(Func<Task> operation, CancellationToken
releaser = default;
}

await this.ExecuteCoreAsync(async delegate
bool pushed = false;
var pushedReleaser = new StrongBox<AsyncSemaphore.Releaser>(releaser);
AArnott marked this conversation as resolved.
Show resolved Hide resolved
try
{
bool pushed = false;
var pushedReleaser = new StrongBox<AsyncSemaphore.Releaser>(releaser);
try
await this.ExecuteCoreAsync(async delegate
{
if (this.IsJoinableTaskAware(out JoinableTaskFactory? joinableTaskFactory, out _))
{
Expand Down Expand Up @@ -760,33 +760,33 @@ public override async Task ExecuteAsync(Func<Task> operation, CancellationToken
}

await operation().ConfigureAwaitRunInline();
}
finally
});
}
finally
{
try
{
try
if (pushed)
{
if (pushed)
lock (reentrantStack)
{
lock (reentrantStack)
StrongBox<AsyncSemaphore.Releaser>? poppedReleaser = reentrantStack.Pop();
if (!object.ReferenceEquals(poppedReleaser, pushedReleaser))
{
StrongBox<AsyncSemaphore.Releaser>? poppedReleaser = reentrantStack.Pop();
if (!object.ReferenceEquals(poppedReleaser, pushedReleaser))
{
// When the semaphore faults, we will drain and throw for awaiting tasks one by one.
this.faulted = true;
// When the semaphore faults, we will drain and throw for awaiting tasks one by one.
this.faulted = true;
#pragma warning disable CA2219 // Do not raise exceptions in finally clauses
throw Verify.FailOperation(Strings.SemaphoreStackNestingViolated, ReentrancyMode.Stack);
throw Verify.FailOperation(Strings.SemaphoreStackNestingViolated, ReentrancyMode.Stack);
#pragma warning restore CA2219 // Do not raise exceptions in finally clauses
}
}
}
}
finally
{
DisposeReleaserNoThrow(releaser);
}
}
});
finally
{
DisposeReleaserNoThrow(releaser);
}
}
}

/// <inheritdoc />
Expand Down Expand Up @@ -841,11 +841,11 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
releaser = default;
}

return await this.ExecuteCoreAsync(async delegate
bool pushed = false;
var pushedReleaser = new StrongBox<AsyncSemaphore.Releaser>(releaser);
try
{
bool pushed = false;
var pushedReleaser = new StrongBox<AsyncSemaphore.Releaser>(releaser);
try
return await this.ExecuteCoreAsync(async delegate
{
if (this.IsJoinableTaskAware(out JoinableTaskFactory? joinableTaskFactory, out _))
{
Expand Down Expand Up @@ -876,33 +876,33 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
}

return await operation().ConfigureAwait(true);
}
finally
});
}
finally
{
try
{
try
if (pushed)
{
if (pushed)
lock (reentrantStack)
{
lock (reentrantStack)
StrongBox<AsyncSemaphore.Releaser>? poppedReleaser = reentrantStack.Pop();
if (!object.ReferenceEquals(poppedReleaser, pushedReleaser))
{
StrongBox<AsyncSemaphore.Releaser>? poppedReleaser = reentrantStack.Pop();
if (!object.ReferenceEquals(poppedReleaser, pushedReleaser))
{
// When the semaphore faults, we will drain and throw for awaiting tasks one by one.
this.faulted = true;
// When the semaphore faults, we will drain and throw for awaiting tasks one by one.
this.faulted = true;
#pragma warning disable CA2219 // Do not raise exceptions in finally clauses
throw Verify.FailOperation(Strings.SemaphoreStackNestingViolated, ReentrancyMode.Stack);
throw Verify.FailOperation(Strings.SemaphoreStackNestingViolated, ReentrancyMode.Stack);
#pragma warning restore CA2219 // Do not raise exceptions in finally clauses
}
}
}
}
finally
{
DisposeReleaserNoThrow(releaser);
}
}
});
finally
{
DisposeReleaserNoThrow(releaser);
}
}
}

/// <inheritdoc />
Expand Down Expand Up @@ -990,10 +990,10 @@ public override async Task ExecuteAsync(Func<Task> operation, CancellationToken
releaser = default;
}

await this.ExecuteCoreAsync(async delegate
bool pushed = false;
try
{
bool pushed = false;
try
await this.ExecuteCoreAsync(async delegate
{
if (this.IsJoinableTaskAware(out JoinableTaskFactory? joinableTaskFactory, out _))
{
Expand Down Expand Up @@ -1022,20 +1022,20 @@ public override async Task ExecuteAsync(Func<Task> operation, CancellationToken
}

await operation().ConfigureAwaitRunInline();
}
finally
});
}
finally
{
if (pushed)
{
if (pushed)
lock (reentrantStack)
{
lock (reentrantStack)
{
releaser = reentrantStack.Pop();
}
releaser = reentrantStack.Pop();
}

DisposeReleaserNoThrow(releaser);
}
});

DisposeReleaserNoThrow(releaser);
}
}

/// <inheritdoc />
Expand Down Expand Up @@ -1086,10 +1086,10 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
releaser = default;
}

return await this.ExecuteCoreAsync(async delegate
bool pushed = false;
try
{
bool pushed = false;
try
return await this.ExecuteCoreAsync(async delegate
{
if (this.IsJoinableTaskAware(out JoinableTaskFactory? joinableTaskFactory, out _))
{
Expand Down Expand Up @@ -1118,20 +1118,20 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
}

return await operation().ConfigureAwait(true);
}
finally
});
}
finally
{
if (pushed)
{
if (pushed)
lock (reentrantStack)
{
lock (reentrantStack)
{
releaser = reentrantStack.Pop();
}
releaser = reentrantStack.Pop();
}

DisposeReleaserNoThrow(releaser);
}
});

DisposeReleaserNoThrow(releaser);
}
}

/// <inheritdoc />
Expand Down