RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-30 19:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor cancellation logic

Browse Source
This commit is contained in:
Dan Balasescu 2022-03-24 16:29:59 +09:00
parent 4c0d76573c
commit dfa076c169
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View File

@ -319,9 +319,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
countdownStopSource?.Cancel();
// Note that this will leak CTSs, however this is a test method and we haven't noticed foregoing disposal of non-linked CTSs to be detrimental.
// If necessary, this can be moved into the final schedule below, and the class-level fields be nulled out accordingly.
var stopSource = countdownStopSource = new CancellationTokenSource();
var skipSource = countdownSkipSource = new CancellationTokenSource();
var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(stopSource.Token, skipSource.Token);
var countdown = new MatchStartCountdown { TimeRemaining = matchCountdownRequest.Duration };
Task lastCountdownTask = countdownTask;
@ -342,7 +343,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
try
{
await Task.Delay(matchCountdownRequest.Duration, cancellationSource.Token).ConfigureAwait(false);
using (var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(stopSource.Token, skipSource.Token))
await Task.Delay(matchCountdownRequest.Duration, cancellationSource.Token).ConfigureAwait(false);
}
catch (OperationCanceledException)
{
@ -351,19 +353,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
Schedule(() =>
{
using (cancellationSource)
{
if (Room.Countdown != countdown)
return;
if (Room.Countdown != countdown)
return;
Room.Countdown = null;
MatchEvent(new CountdownChangedEvent { Countdown = null });
Room.Countdown = null;
MatchEvent(new CountdownChangedEvent { Countdown = null });
if (stopSource.Token.IsCancellationRequested)
return;
if (stopSource.IsCancellationRequested)
return;
StartMatch().WaitSafely();
}
StartMatch().WaitSafely();
});
}