Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Avoiding suspending BeefPerf thread

Browse source
This commit is contained in:
Brian Fiete 2019-12-24 10:30:42 -08:00
parent f1e2148769
commit aa7cff43dd
2 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
BeefRT/dbg/gc.cpp
View file

@ -216,6 +216,16 @@ BFGC::ThreadInfo::~ThreadInfo()
BfpThread_Release(mThreadHandle);
}
bool BFGC::ThreadInfo::WantsSuspend()
{
#ifndef BP_DISABLED
BfpThreadId threadId = BpManager::Get()->mThreadId;
return threadId != (BfpThreadId)mThreadId;
#else
return true;
#endif
}
//////////////////////////////////////////////////////////////////////////
#ifdef BF_GC_LOG_ENABLED
@ -1371,7 +1381,7 @@ bool BFGC::ScanThreads()
continue;
}
BP_ZONE("ThreadCollect");
BP_ZONE_F("ThreadCollect %d", thread->mThreadId);
//Beefy::DebugTimeGuard suspendTimeGuard(10, "ThreadSuspend");
DWORD result = 0;
@ -1405,16 +1415,24 @@ bool BFGC::ScanThreads()
BFLOG2(GCLog::EVENT_SCAN_THREAD, (intptr)thread, (intptr)thread->mThreadId);
//
{
BP_ZONE("StackMarkableObjects");
for (auto obj : thread->mStackMarkableObjects)
{
MarkMembers(obj);
}
}
intptr regVals[64];
intptr stackPtr = 0;
BfpThreadResult threadResult;
int regValCount = 64;
///
{
BP_ZONE("BfpThread_GetIntRegisters");
BfpThread_GetIntRegisters(thread->mThreadHandle, &stackPtr, regVals, &regValCount, &threadResult);
}
BF_ASSERT(threadResult == BfpThreadResult_Ok);
void** threadLoadAddressMap = (void**)((_TEB*)thread->mTEB)->ThreadLocalStorage;
@ -1432,7 +1450,10 @@ bool BFGC::ScanThreads()
int length = thread->mStackStart - stackPtr;
AdjustStackPtr(stackPtr, length);
{
BP_ZONE("ConservativeScan stack");
ConservativeScan((void*)stackPtr, length);
}
mQueueMarkObjects = false;
if (mDoStackDeepMark)
@ -2260,7 +2281,7 @@ void BFGC::SuspendThreads()
auto curThreadId = GetCurrentThreadId();
for (auto thread : mThreadList)
{
if ((thread->mThreadId != curThreadId) && (thread->mRunning))
if ((thread->mThreadId != curThreadId) && (thread->mRunning) && (thread->WantsSuspend()))
{
// We must lock this before suspending so we can access mStackMarkableObjects
// Otherwise we could deadlock
@ -2279,7 +2300,7 @@ void BFGC::ResumeThreads()
auto curThreadId = GetCurrentThreadId();
for (auto thread : mThreadList)
{
if ((thread->mThreadId != curThreadId) && (thread->mRunning))
if ((thread->mThreadId != curThreadId) && (thread->mRunning) && (thread->WantsSuspend()))
{
// Previously locked in SuspendThreads
thread->mCritSect.Unlock();

2
BeefRT/dbg/gc.h
View file

@ -186,6 +186,8 @@ public:
}
~ThreadInfo();
bool WantsSuspend();
};
struct RawLeakInfo