RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update TaskChain to use ContinueWithSequential internally 

It turns out we may still want to use TaskChain for its locking
behaviour, so I've made it internally use the refactored version I
implemented, while keeping the general structure.
This commit is contained in:
Dean Herbert 2021-01-29 16:06:57 +09:00
parent a30aecbafe
commit 1ec305e10d
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using osu.Game.Extensions;
namespace osu.Game.Utils
{
@ -14,8 +15,9 @@ namespace osu.Game.Utils
/// </summary>
public class TaskChain
{
private readonly object finalTaskLock = new object();
private Task? finalTask;
private readonly object taskLock = new object();
private Task lastTaskInChain = Task.CompletedTask;
/// <summary>
/// Adds a new task to the end of this <see cref="TaskChain"/>.
@ -23,22 +25,22 @@ public class TaskChain
/// <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 async Task Add(Action action, CancellationToken cancellationToken = default)
public Task Add(Action action, CancellationToken cancellationToken = default)
{
Task? previousTask;
Task currentTask;
lock (taskLock)
return lastTaskInChain = lastTaskInChain.ContinueWithSequential(action, cancellationToken);
}
lock (finalTaskLock)
{
previousTask = finalTask;
finalTask = currentTask = new Task(action, cancellationToken);
}
if (previousTask != null)
await previousTask;
currentTask.Start();
await currentTask;
/// <summary>
/// Adds a new task to the end of this <see cref="TaskChain"/>.
/// </summary>
/// <param name="task">The task 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> task, CancellationToken cancellationToken = default)
{
lock (taskLock)
return lastTaskInChain = lastTaskInChain.ContinueWithSequential(task, cancellationToken);
}
}
}