Skip to content

Apply adjustments for struct attributes #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smoogipoo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Apply adjustments for struct attributes #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BeatmapDifficultyLookupCache/Controllers/AttributesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ public AttributesController(DifficultyCache cache)
}

[HttpPost]
public Task<DifficultyAttributes> Post([FromBody] DifficultyRequest request) => cache.GetAttributes(request);
public Task<IDifficultyAttributes> Post([FromBody] DifficultyRequest request) => cache.GetAttributes(request);
}
}
20 changes: 8 additions & 12 deletions BeatmapDifficultyLookupCache/DifficultyCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
using osu.Game.Rulesets.Catch.Difficulty;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mania.Difficulty;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu.Difficulty;
using osu.Game.Rulesets.Taiko.Difficulty;
using osu.Server.QueueProcessor;
Expand All @@ -30,9 +29,9 @@ namespace BeatmapDifficultyLookupCache
public class DifficultyCache
{
private static readonly List<Ruleset> available_rulesets = getRulesets();
private static readonly DifficultyAttributes empty_attributes = new DifficultyAttributes(Array.Empty<Mod>(), -1);
private static readonly IDifficultyAttributes empty_attributes = new EmptyDifficultyAttributes { StarRating = -1 };

private readonly Dictionary<DifficultyRequest, Task<DifficultyAttributes>> attributesCache = new Dictionary<DifficultyRequest, Task<DifficultyAttributes>>();
private readonly Dictionary<DifficultyRequest, Task<IDifficultyAttributes>> attributesCache = new Dictionary<DifficultyRequest, Task<IDifficultyAttributes>>();
private readonly ILogger logger;

private readonly bool useDatabase;
Expand All @@ -57,7 +56,7 @@ public async Task<double> GetDifficultyRating(DifficultyRequest request)
return (await computeAttributes(request)).StarRating;
}

public async Task<DifficultyAttributes> GetAttributes(DifficultyRequest request)
public async Task<IDifficultyAttributes> GetAttributes(DifficultyRequest request)
{
if (request.BeatmapId == 0)
return empty_attributes;
Expand All @@ -72,14 +71,14 @@ public async Task<DifficultyAttributes> GetAttributes(DifficultyRequest request)
{
// Databased attribute retrieval can fail if the database doesn't contain all attributes for a given beatmap.
// If such a case occurs, fall back to providing just the star rating rather than outputting exceptions.
return new DifficultyAttributes { StarRating = await GetDifficultyRating(request) };
return new EmptyDifficultyAttributes { StarRating = await GetDifficultyRating(request) };
}
}

return await computeAttributes(request);
}

private async Task<DifficultyAttributes> getDatabasedAttributes(DifficultyRequest request)
private async Task<IDifficultyAttributes> getDatabasedAttributes(DifficultyRequest request)
{
int mods = getModBitwise(request.RulesetId, request.GetMods());

Expand All @@ -96,7 +95,7 @@ private async Task<DifficultyAttributes> getDatabasedAttributes(DifficultyReques
})).ToArray();
}

DifficultyAttributes attributes;
IDifficultyAttributes attributes;

switch (request.RulesetId)
{
Expand Down Expand Up @@ -151,9 +150,9 @@ private async Task<float> getDatabasedDifficulty(DifficultyRequest request)
}
}

private async Task<DifficultyAttributes> computeAttributes(DifficultyRequest request)
private async Task<IDifficultyAttributes> computeAttributes(DifficultyRequest request)
{
Task<DifficultyAttributes>? task;
Task<IDifficultyAttributes>? task;

lock (attributesCache)
{
Expand All @@ -177,9 +176,6 @@ private async Task<DifficultyAttributes> computeAttributes(DifficultyRequest req
var difficultyCalculator = ruleset.CreateDifficultyCalculator(beatmap);
var attributes = difficultyCalculator.Calculate(mods);

// Trim a few members which we don't consume and only take up RAM.
attributes.Mods = Array.Empty<Mod>();

return attributes;
}
catch (Exception e)
Expand Down