Skip to content

Use a recursive mutex for the thread state change lock #1325

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
Aidan63 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

Use a recursive mutex for the thread state change lock #1325

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
12 changes: 6 additions & 6 deletions src/hx/gc/Immix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ static int sgTimeToNextTableUpdate = 1;



std::mutex *gThreadStateChangeLock=nullptr;
std::recursive_mutex *gThreadStateChangeLock=nullptr;
std::mutex *gSpecialObjectLock=nullptr;

class LocalAllocator;
Expand Down Expand Up @@ -3133,12 +3133,12 @@ class GlobalAllocator
{
if (!gThreadStateChangeLock)
{
gThreadStateChangeLock = new std::mutex();
gThreadStateChangeLock = new std::recursive_mutex();
gSpecialObjectLock = new std::mutex();
}
// Until we add ourselves, the collector will not wait
// on us - ie, we are assumed ot be in a GC free zone.
std::lock_guard<std::mutex> lock(*gThreadStateChangeLock);
std::lock_guard<std::recursive_mutex> lock(*gThreadStateChangeLock);
mLocalAllocs.push(inAlloc);
// TODO Attach debugger
}
Expand All @@ -3161,7 +3161,7 @@ class GlobalAllocator

LocalAllocator *GetPooledAllocator()
{
std::lock_guard<std::mutex> lock(*gThreadStateChangeLock);
std::lock_guard<std::recursive_mutex> lock(*gThreadStateChangeLock);
for(int p=0;p<LOCAL_POOL_SIZE;p++)
{
if (mLocalPool[p])
Expand Down Expand Up @@ -5857,7 +5857,7 @@ class LocalAllocator : public hx::StackContext
EnterGCFreeZone();
#endif

std::lock_guard<std::mutex> lock(*gThreadStateChangeLock);
std::lock_guard<std::recursive_mutex> lock(*gThreadStateChangeLock);

#ifdef HX_WINDOWS
mID = 0;
Expand Down Expand Up @@ -6084,7 +6084,7 @@ class LocalAllocator : public hx::StackContext
if (!mGCFreeZone)
CriticalGCError("GCFree Zone mismatch");

std::lock_guard<std::mutex> lock(*gThreadStateChangeLock);
std::lock_guard<std::recursive_mutex> lock(*gThreadStateChangeLock);
mReadyForCollect.Reset();
mGCFreeZone = false;
#endif
Expand Down
Loading