sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 14:17:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix TaskChain performing the action in-line, add test

Browse Source
This commit is contained in:
smoogipoo
2021-01-26 22:47:37 +09:00
parent c17774e23c
commit 8c3b0a3167
2 changed files with 106 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Utils/TaskChain.cs
View File

@ -4,6 +4,7 @@
#nullable enable
using System;
using System.Threading;
using System.Threading.Tasks;
namespace osu.Game.Utils
@ -19,15 +20,32 @@ namespace osu.Game.Utils
/// <summary>
/// Adds a new task to the end of this <see cref="TaskChain"/>.
/// </summary>
/// <param name="taskFunc">The task creation function.</param>
/// <param name="action">The action to be executed.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
/// <returns>The awaitable <see cref="Task"/>.</returns>
public Task Add(Func<Task> taskFunc)
public Task Add(Action action, CancellationToken cancellationToken = default)
{
lock (currentTaskLock)
{
currentTask = currentTask == null
? taskFunc()
: currentTask.ContinueWith(_ => taskFunc()).Unwrap();
// Note: Attaching the cancellation token to the continuation could lead to re-ordering of tasks in the chain.
// Therefore, the cancellation token is not used to cancel the continuation but only the run of each task.
if (currentTask == null)
{
currentTask = Task.Run(() =>
{
cancellationToken.ThrowIfCancellationRequested();
action();
}, CancellationToken.None);
}
else
{
currentTask = currentTask.ContinueWith(_ =>
{
cancellationToken.ThrowIfCancellationRequested();
action();
}, CancellationToken.None);
}
return currentTask;
}
}