sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-21 21:47:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential deadlock on nested context creation requests

Browse Source
This commit is contained in:
Dean Herbert 2021-11-29 16:18:57 +09:00
parent 54798eabc9
commit c98451a7bf
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Database/RealmContextFactory.cs
View File

@ -52,6 +52,8 @@ namespace osu.Game.Database
/// </summary> /// </summary>
private readonly SemaphoreSlim contextCreationLock = new SemaphoreSlim(1); private readonly SemaphoreSlim contextCreationLock = new SemaphoreSlim(1);
private bool canCreateContexts;
private static readonly GlobalStatistic<int> refreshes = GlobalStatistics.Get<int>(@"Realm", @"Dirty Refreshes"); private static readonly GlobalStatistic<int> refreshes = GlobalStatistics.Get<int>(@"Realm", @"Dirty Refreshes");
private static readonly GlobalStatistic<int> contexts_created = GlobalStatistics.Get<int>(@"Realm", @"Contexts (Created)"); private static readonly GlobalStatistic<int> contexts_created = GlobalStatistics.Get<int>(@"Realm", @"Contexts (Created)");
@ -153,7 +155,13 @@ namespace osu.Game.Database
try try
{ {
contextCreationLock.Wait(); if (!canCreateContexts)
contextCreationLock.Wait();
// the semaphore is used to stop all context creation.
// once the semaphore has been taken by this code section, it is safe to create further contexts.
// this can happen if a realm subscription is active and triggers a callback which has user code that calls `CreateContext`.
canCreateContexts = true;
contexts_created.Value++; contexts_created.Value++;
@ -162,6 +170,7 @@ namespace osu.Game.Database
finally finally
{ {
contextCreationLock.Release(); contextCreationLock.Release();
canCreateContexts = false;
} }
} }