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

Fixed hot thread state issue with thread creation during hot swap

Browse source
This commit is contained in:
Brian Fiete 2020-06-15 14:48:25 -07:00
parent b811f5daf8
commit d9b81daac8
2 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
IDEHelper/WinDebugger.cpp
View file

@ -1073,7 +1073,8 @@ void WinDebugger::HotLoad(const Array<String>& objectFiles, int hotIdx)
SetAndRestoreValue<WdThreadInfo*> prevActiveThread(mActiveThread, threadInfo);
BfLogDbg("SuspendThread %d\n", threadInfo->mThreadId);
::SuspendThread(threadInfo->mHThread);
PopulateRegisters(&mHotThreadStates[threadIdx]);
mHotThreadStates[threadIdx].mThreadId = threadInfo->mThreadId;
PopulateRegisters(&mHotThreadStates[threadIdx].mRegisters);
}
for (auto address : mTempBreakpoint)
@ -1130,9 +1131,13 @@ void WinDebugger::HotLoad(const Array<String>& objectFiles, int hotIdx)
CheckBreakpoint(breakpoint);
}
for (int threadIdx = 0; threadIdx < (int)mThreadList.size(); threadIdx++)
for (int hotThreadIdx = 0; hotThreadIdx < (int)mHotThreadStates.size(); hotThreadIdx++)
{
WdThreadInfo* threadInfo = mThreadList[threadIdx];
auto& hotThreadState = mHotThreadStates[hotThreadIdx];
WdThreadInfo* threadInfo = NULL;
if (!mThreadMap.TryGetValue((uint32)hotThreadState.mThreadId, &threadInfo))
continue;
BfLogDbg("ResumeThread %d\n", threadInfo->mThreadId);
::ResumeThread(threadInfo->mHThread);
}
@ -5100,13 +5105,16 @@ bool WinDebugger::SetHotJump(DbgSubprogram* oldSubprogram, addr_target newTarget
if (oldSubprogram->mHotReplaceKind != DbgSubprogram::HotReplaceKind_Replaced)
{
for (int threadIdx = 0; threadIdx < (int)mThreadList.size(); threadIdx++)
for (int hotThreadIdx = 0; hotThreadIdx < (int)mHotThreadStates.size(); hotThreadIdx++)
{
CPURegisters* cpuRegisters = &mHotThreadStates[threadIdx];
auto& hotThreadState = mHotThreadStates[hotThreadIdx];
WdThreadInfo* threadInfo = NULL;
if (!mThreadMap.TryGetValue((uint32)hotThreadState.mThreadId, &threadInfo))
continue;
int tryStart = GetTickCount();
while ((cpuRegisters->GetPC() >= jmpInstStart) && (cpuRegisters->GetPC() < jmpInstEnd))
while ((hotThreadState.mRegisters.GetPC() >= jmpInstStart) && (hotThreadState.mRegisters.GetPC() < jmpInstEnd))
{
if (GetTickCount() - tryStart >= 8000)
{
@ -5114,11 +5122,11 @@ bool WinDebugger::SetHotJump(DbgSubprogram* oldSubprogram, addr_target newTarget
return false;
}
BfLogDbg("SetHotJump skipping through %p\n", cpuRegisters->GetPC());
BfLogDbg("SetHotJump skipping through %p\n", hotThreadState.mRegisters.GetPC());
bool removedBreakpoint = false;
mActiveThread = mThreadList[threadIdx];
mActiveThread = threadInfo;
if ((mActiveThread->mStoppedAtAddress >= jmpInstStart) && (mActiveThread->mStoppedAtAddress < jmpInstEnd))
{
for (addr_target addr = jmpInstStart; addr < jmpInstEnd; addr++)
@ -5184,7 +5192,7 @@ bool WinDebugger::SetHotJump(DbgSubprogram* oldSubprogram, addr_target newTarget
}
}
PopulateRegisters(cpuRegisters);
PopulateRegisters(&hotThreadState.mRegisters);
}
}
}

8
IDEHelper/WinDebugger.h
View file

@ -378,13 +378,19 @@ struct DbgPendingDebugInfoLoad
}
};
struct WinHotThreadState
{
CPURegisters mRegisters;
int mThreadId;
};
class WinDebugger : public Debugger
{
public:
SyncEvent mContinueEvent;
Array<HotTargetMemory> mHotTargetMemory;
Array<CPURegisters> mHotThreadStates;
Array<WinHotThreadState> mHotThreadStates;
int mActiveHotIdx;
volatile bool mShuttingDown;