RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-15 01:27:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15519 from peppy/realm-ruleset-store-thread-correctness

Browse Source 
Start initialising `RealmRulesetStore` on startup
This commit is contained in:
Dan Balasescu 2021-11-08 17:08:25 +09:00 committed by GitHub
commit 68d6a5f2c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/OsuGameBase.cs
View File

@ -40,6 +40,7 @@ using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Skinning; using osu.Game.Skinning;
using osu.Game.Stores;
using osu.Game.Utils; using osu.Game.Utils;
using RuntimeInfo = osu.Framework.RuntimeInfo; using RuntimeInfo = osu.Framework.RuntimeInfo;
@ -160,6 +161,8 @@ namespace osu.Game
private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(GLOBAL_TRACK_VOLUME_ADJUST); private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(GLOBAL_TRACK_VOLUME_ADJUST);
private RealmRulesetStore realmRulesetStore;
public OsuGameBase() public OsuGameBase()
{ {
UseDevelopmentServer = DebugUtils.IsDebugBuild; UseDevelopmentServer = DebugUtils.IsDebugBuild;
@ -231,6 +234,11 @@ namespace osu.Game
dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Scheduler, Host, () => difficultyCache, LocalConfig)); dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Scheduler, Host, () => difficultyCache, LocalConfig));
dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Resources, Host, defaultBeatmap, performOnlineLookups: true)); dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Resources, Host, defaultBeatmap, performOnlineLookups: true));
// the following realm components are not actively used yet, but initialised and kept up to date for initial testing.
realmRulesetStore = new RealmRulesetStore(realmFactory, Storage);
dependencies.Cache(realmRulesetStore);
// this should likely be moved to ArchiveModelManager when another case appears where it is necessary // this should likely be moved to ArchiveModelManager when another case appears where it is necessary
// to have inter-dependent model managers. this could be obtained with an IHasForeign<T> interface to // to have inter-dependent model managers. this could be obtained with an IHasForeign<T> interface to
// allow lookups to be done on the child (ScoreManager in this case) to perform the cascading delete. // allow lookups to be done on the child (ScoreManager in this case) to perform the cascading delete.
@ -512,6 +520,8 @@ namespace osu.Game
LocalConfig?.Dispose(); LocalConfig?.Dispose();
contextFactory?.FlushConnections(); contextFactory?.FlushConnections();
realmRulesetStore?.Dispose();
realmFactory?.Dispose(); realmFactory?.Dispose();
} }
} }

5
osu.Game/Stores/RealmRulesetStore.cs
View File

@ -102,7 +102,9 @@ namespace osu.Game.Stores
private void addMissingRulesets() private void addMissingRulesets()
{ {
realmFactory.Context.Write(realm => using (var context = realmFactory.CreateContext())
{
context.Write(realm =>
{ {
var rulesets = realm.All<RealmRuleset>(); var rulesets = realm.All<RealmRuleset>();
@ -172,6 +174,7 @@ namespace osu.Game.Stores
availableRulesets.AddRange(detachedRulesets); availableRulesets.AddRange(detachedRulesets);
}); });
} }
}
private void loadFromAppDomain() private void loadFromAppDomain()
{ {