h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 14:57:52 +08:00
Code Issues Releases Wiki Activity

Rename realm ThreadLocal to better convey what it's doing

Browse Source 
Every time I looked at this code I have to re-learn what it's doing.
Changing these variable names should help quite a bit.
This commit is contained in:
Dean Herbert 2022-07-04 14:59:44 +09:00
parent b49a1aab8a
commit 1b98936328
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Database/RealmAccess.cs
View File

@ -66,7 +66,10 @@ namespace osu.Game.Database
/// </summary>
private readonly SemaphoreSlim realmRetrievalLock = new SemaphoreSlim(1);
private readonly ThreadLocal<bool> currentThreadCanCreateRealmInstances = new ThreadLocal<bool>();
/// <summary>
/// <c>true</c> when the current thread has already entered the <see cref="realmRetrievalLock"/>.
/// </summary>
private readonly ThreadLocal<bool> currentThreadHasRealmRetrievalLock = new ThreadLocal<bool>();
/// <summary>
/// Holds a map of functions registered via <see cref="RegisterCustomSubscription"/> and <see cref="RegisterForNotifications{T}"/> and a coinciding action which when triggered,
@ -584,10 +587,11 @@ namespace osu.Game.Database
try
{
if (!currentThreadCanCreateRealmInstances.Value)
// Ensure that the thread that currently has the `realmRetrievalLock` can retrieve nested contexts and not deadlock on itself.
if (!currentThreadHasRealmRetrievalLock.Value)
{
realmRetrievalLock.Wait();
currentThreadCanCreateRealmInstances.Value = true;
currentThreadHasRealmRetrievalLock.Value = true;
tookSemaphoreLock = true;
}
else
@ -611,7 +615,7 @@ namespace osu.Game.Database
if (tookSemaphoreLock)
{
realmRetrievalLock.Release();
currentThreadCanCreateRealmInstances.Value = false;
currentThreadHasRealmRetrievalLock.Value = false;
}
}
}