h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
Code Issues Releases Wiki Activity

Add locking around async beatmap (task) retrieval

Browse Source
This commit is contained in:
Dean Herbert 2021-10-14 15:39:08 +09:00
parent 2e0a2a28ab
commit 060bb1afbd
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -205,19 +205,27 @@ namespace osu.Game.Beatmaps
return new CancellationTokenSource(timeout ?? TimeSpan.FromSeconds(10)); return new CancellationTokenSource(timeout ?? TimeSpan.FromSeconds(10));
} }
private Task<IBeatmap> loadBeatmapAsync() => beatmapLoadTask ??= Task.Factory.StartNew(() => private readonly object beatmapFetchLock = new object();
private Task<IBeatmap> loadBeatmapAsync()
{ {
// Todo: Handle cancellation during beatmap parsing lock (beatmapFetchLock)
var b = GetBeatmap() ?? new Beatmap(); {
return beatmapLoadTask ??= Task.Factory.StartNew(() =>
{
// Todo: Handle cancellation during beatmap parsing
var b = GetBeatmap() ?? new Beatmap();
// The original beatmap version needs to be preserved as the database doesn't contain it // The original beatmap version needs to be preserved as the database doesn't contain it
BeatmapInfo.BeatmapVersion = b.BeatmapInfo.BeatmapVersion; BeatmapInfo.BeatmapVersion = b.BeatmapInfo.BeatmapVersion;
// Use the database-backed info for more up-to-date values (beatmap id, ranked status, etc) // Use the database-backed info for more up-to-date values (beatmap id, ranked status, etc)
b.BeatmapInfo = BeatmapInfo; b.BeatmapInfo = BeatmapInfo;
return b; return b;
}, loadCancellation.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default); }, loadCancellation.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
}
}
public override string ToString() => BeatmapInfo.ToString(); public override string ToString() => BeatmapInfo.ToString();