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

Dedup Task.WhenAll non-generic and generic implementations #88154

Merged
merged 2 commits into from
Jul 5, 2023
Merged

Dedup Task.WhenAll non-generic and generic implementations #88154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fcd926
Dedup Task.WhenAll non-generic and generic implementations
stephentoub Jun 28, 2023
9e4aff5
Merge branch 'dotnet:main' into taskwhenany
stephentoub Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 13 additions & 53 deletions src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/FutureFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,15 +1626,19 @@ public Task<TResult> ContinueWhenAll<TAntecedentResult>(Task<TAntecedentResult>[
if (continuationFunction != null)
{
return starter.ContinueWith(
GenericDelegateCache<TAntecedentResult, TResult>.CWAllFuncDelegate,
static (starter, continuationFunction) => ((Func<Task<TAntecedentResult>[], TResult>)continuationFunction!)(starter.Result),
continuationFunction, scheduler, cancellationToken, continuationOptions);
}
else
{
Debug.Assert(continuationAction != null);

return starter.ContinueWith(
GenericDelegateCache<TAntecedentResult, TResult>.CWAllActionDelegate,
static (starter, continuationAction) =>
{
((Action<Task<TAntecedentResult>[]>)continuationAction!)(starter.Result);
return default(TResult)!;
},
continuationAction, scheduler, cancellationToken, continuationOptions);
}
}
Expand Down Expand Up @@ -2026,7 +2030,7 @@ public Task<TResult> ContinueWhenAny<TAntecedentResult>(Task<TAntecedentResult>[
if (scheduler == null) ThrowHelper.ThrowArgumentNullException(ExceptionArgument.scheduler);

// Call common ContinueWhenAny setup logic, extract starter
Task<Task> starter = TaskFactory.CommonCWAnyLogic(tasks);
Task<Task<TAntecedentResult>> starter = TaskFactory.CommonCWAnyLogic(tasks);

// Bail early if cancellation has been requested.
if (cancellationToken.IsCancellationRequested
Expand All @@ -2040,64 +2044,20 @@ public Task<TResult> ContinueWhenAny<TAntecedentResult>(Task<TAntecedentResult>[
if (continuationFunction != null)
{
return starter.ContinueWith(
GenericDelegateCache<TAntecedentResult, TResult>.CWAnyFuncDelegate,
static (starter, continuationFunction) => ((Func<Task<TAntecedentResult>, TResult>)continuationFunction!)(starter.Result),
continuationFunction, scheduler, cancellationToken, continuationOptions);
}
else
{
Debug.Assert(continuationAction != null);
return starter.ContinueWith(
GenericDelegateCache<TAntecedentResult, TResult>.CWAnyActionDelegate,
static (starter, continuationAction) =>
{
((Action<Task<TAntecedentResult>>)continuationAction!)(starter.Result);
return default(TResult)!;
},
continuationAction, scheduler, cancellationToken, continuationOptions);
}
}
}

// For the ContinueWhenAnyImpl/ContinueWhenAllImpl methods that are generic on TAntecedentResult,
// the compiler won't cache the internal ContinueWith delegate because it is generic on both
// TAntecedentResult and TResult. The GenericDelegateCache serves as a cache for those delegates.
internal static class GenericDelegateCache<TAntecedentResult, TResult>
{
// ContinueWith delegate for TaskFactory<TResult>.ContinueWhenAnyImpl<TAntecedentResult>(non-null continuationFunction)
internal static Func<Task<Task>, object?, TResult> CWAnyFuncDelegate =
static (Task<Task> wrappedWinner, object? state) =>
{
Debug.Assert(state is Func<Task<TAntecedentResult>, TResult>);
var func = (Func<Task<TAntecedentResult>, TResult>)state;
var arg = (Task<TAntecedentResult>)wrappedWinner.Result;
return func(arg);
};

// ContinueWith delegate for TaskFactory<TResult>.ContinueWhenAnyImpl<TAntecedentResult>(non-null continuationAction)
internal static Func<Task<Task>, object?, TResult> CWAnyActionDelegate =
static (Task<Task> wrappedWinner, object? state) =>
{
Debug.Assert(state is Action<Task<TAntecedentResult>>);
var action = (Action<Task<TAntecedentResult>>)state;
var arg = (Task<TAntecedentResult>)wrappedWinner.Result;
action(arg);
return default!;
};

// ContinueWith delegate for TaskFactory<TResult>.ContinueWhenAllImpl<TAntecedentResult>(non-null continuationFunction)
internal static Func<Task<Task<TAntecedentResult>[]>, object?, TResult> CWAllFuncDelegate =
static (Task<Task<TAntecedentResult>[]> wrappedAntecedents, object? state) =>
{
wrappedAntecedents.NotifyDebuggerOfWaitCompletionIfNecessary();
Debug.Assert(state is Func<Task<TAntecedentResult>[], TResult>);
var func = (Func<Task<TAntecedentResult>[], TResult>)state;
return func(wrappedAntecedents.Result);
};

// ContinueWith delegate for TaskFactory<TResult>.ContinueWhenAllImpl<TAntecedentResult>(non-null continuationAction)
internal static Func<Task<Task<TAntecedentResult>[]>, object?, TResult> CWAllActionDelegate =
static (Task<Task<TAntecedentResult>[]> wrappedAntecedents, object? state) =>
{
wrappedAntecedents.NotifyDebuggerOfWaitCompletionIfNecessary();
Debug.Assert(state is Action<Task<TAntecedentResult>[]>);
var action = (Action<Task<TAntecedentResult>[]>)state;
action(wrappedAntecedents.Result);
return default!;
};
}
}
Loading
Loading