RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-20 13:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cache performance calculations to prevent recomputations.

Browse Source
This commit is contained in:
Lucas A 2020-09-28 19:04:39 +02:00
parent ddede85704
commit 6efc4c4250
2 changed files with 71 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
osu.Game/Scoring/ScorePerformanceManager.cs
View File

@ -1,17 +1,22 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Mods;
namespace osu.Game.Scoring
{
public class ScorePerformanceManager : Component
{
private readonly ConcurrentDictionary<PerformanceCacheLookup, double> performanceCache = new ConcurrentDictionary<PerformanceCacheLookup, double>();
[Resolved]
private BeatmapManager beatmapManager { get; set; }
@ -22,18 +27,73 @@ namespace osu.Game.Scoring
/// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
public async Task<double> CalculatePerformanceAsync([NotNull] ScoreInfo score, CancellationToken token = default)
{
if (score.PP.HasValue)
return score.PP.Value;
if (tryGetExisting(score, out var perf, out var lookupKey))
return perf;
return await Task.Factory.StartNew(() =>
{
if (token.IsCancellationRequested)
return default;
var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
var total = calculator.Calculate();
return total;
return computePerformance(score, lookupKey, token);
}, token);
}
private bool tryGetExisting(ScoreInfo score, out double performance, out PerformanceCacheLookup lookupKey)
{
lookupKey = new PerformanceCacheLookup(score);
return performanceCache.TryGetValue(lookupKey, out performance);
}
private double computePerformance(ScoreInfo score, PerformanceCacheLookup lookupKey, CancellationToken token = default)
{
var beatmap = beatmapManager.GetWorkingBeatmap(score.Beatmap);
if (token.IsCancellationRequested)
return default;
var calculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator(beatmap, score);
var total = calculator.Calculate();
performanceCache[lookupKey] = total;
return total;
}
public readonly struct PerformanceCacheLookup
{
public readonly double Accuracy;
public readonly int BeatmapId;
public readonly long TotalScore;
public readonly int Combo;
public readonly Mod[] Mods;
public readonly int RulesetId;
public PerformanceCacheLookup(ScoreInfo info)
{
Accuracy = info.Accuracy;
BeatmapId = info.Beatmap.ID;
TotalScore = info.TotalScore;
Combo = info.Combo;
Mods = info.Mods;
RulesetId = info.Ruleset.ID.Value;
}
public override int GetHashCode()
{
var hash = new HashCode();
hash.Add(Accuracy);
hash.Add(BeatmapId);
hash.Add(TotalScore);
hash.Add(Combo);
hash.Add(RulesetId);
foreach (var mod in Mods)
hash.Add(mod);
return hash.ToHashCode();
}
}
}
}

11
osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
View File

@ -25,15 +25,8 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
[BackgroundDependencyLoader]
private void load(ScorePerformanceManager performanceManager)
{
if (score.PP.HasValue)
{
performance.Value = (int)score.PP.Value;
}
else
{
performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
.ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
}
performanceManager.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
.ContinueWith(t => Schedule(() => performance.Value = (int)t.Result), cancellationTokenSource.Token);
}
public override void Appear()