Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debugger: Refactor CliContext::WaitForThreadOrUser

Browse Source 
Change-Id: Ic232432f253900a44ad9929cafa46971833cfb5b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6367
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
Reviewed-by: Rene Gollent <rene@gollent.com>
This commit is contained in:
Zardshard 2023-04-20 12:52:14 -04:00 committed by Rene Gollent
parent f8bd82e198
commit 39f337c812
3 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/apps/debugger/user_interface/cli/CliContext.cpp
View File

@ -100,6 +100,7 @@ CliContext::CliContext()
fEventsOccurred(0),
fInputLoopWaiting(false),
fTerminating(false),
fStoppedThread(NULL),
fCurrentThread(NULL),
fCurrentStackTrace(NULL),
fCurrentStackFrameIndex(-1),
@ -381,43 +382,24 @@ CliContext::QuitSession(bool killTeam)
void
CliContext::WaitForThreadOrUser()
{
ProcessPendingEvents();
// TODO: Deal with SIGINT as well!
for (;;) {
// if no thread has been stopped, wait till one is
while (fStoppedThread == NULL) {
_PrepareToWaitForEvents(
EVENT_USER_INTERRUPT | EVENT_THREAD_STOPPED);
// check whether there are any threads stopped already
Thread* stoppedThread = NULL;
BReference<Thread> stoppedThreadReference;
AutoLocker<Team> teamLocker(fTeam);
for (ThreadList::ConstIterator it = fTeam->Threads().GetIterator();
Thread* thread = it.Next();) {
if (thread->State() == THREAD_STATE_STOPPED) {
stoppedThread = thread;
stoppedThreadReference.SetTo(thread);
break;
}
}
teamLocker.Unlock();
if (stoppedThread != NULL) {
if (fCurrentThread == NULL)
SetCurrentThread(stoppedThread);
_SignalInputLoop(EVENT_THREAD_STOPPED);
}
EVENT_USER_INTERRUPT | EVENT_THREAD_STATE_CHANGED);
uint32 events = _WaitForEvents();
if ((events & EVENT_QUIT) != 0 || stoppedThread != NULL) {
ProcessPendingEvents();
ProcessPendingEvents();
// updates fStoppedThread if any thread has been stopped
if ((events & EVENT_QUIT) != 0) {
return;
}
}
if (fCurrentThread == NULL)
SetCurrentThread(fStoppedThread);
}
@ -470,9 +452,14 @@ CliContext::ProcessPendingEvents()
printf("[thread terminated: %" B_PRId32 " \"%s\"]\n",
thread->ID(), thread->Name());
break;
case EVENT_THREAD_STOPPED:
printf("[thread stopped: %" B_PRId32 " \"%s\"]\n",
thread->ID(), thread->Name());
case EVENT_THREAD_STATE_CHANGED:
if (thread->State() == THREAD_STATE_STOPPED) {
printf("[thread stopped: %" B_PRId32 " \"%s\"]\n",
thread->ID(), thread->Name());
fStoppedThread.SetTo(thread);
} else {
fStoppedThread = NULL;
}
break;
case EVENT_THREAD_STACK_TRACE_CHANGED:
if (thread == fCurrentThread) {
@ -524,12 +511,9 @@ CliContext::ThreadRemoved(const Team::ThreadEvent& threadEvent)
void
CliContext::ThreadStateChanged(const Team::ThreadEvent& threadEvent)
{
if (threadEvent.GetThread()->State() != THREAD_STATE_STOPPED)
return;
_QueueEvent(
new(std::nothrow) Event(EVENT_THREAD_STOPPED, threadEvent.GetThread()));
_SignalInputLoop(EVENT_THREAD_STOPPED);
new(std::nothrow) Event(EVENT_THREAD_STATE_CHANGED, threadEvent.GetThread()));
_SignalInputLoop(EVENT_THREAD_STATE_CHANGED);
}

3
src/apps/debugger/user_interface/cli/CliContext.h
View File

@ -38,7 +38,7 @@ public:
EVENT_USER_INTERRUPT = 0x02,
EVENT_THREAD_ADDED = 0x04,
EVENT_THREAD_REMOVED = 0x08,
EVENT_THREAD_STOPPED = 0x10,
EVENT_THREAD_STATE_CHANGED = 0x10,
EVENT_THREAD_STACK_TRACE_CHANGED = 0x20,
EVENT_VALUE_NODE_CHANGED = 0x40,
EVENT_TEAM_MEMORY_BLOCK_RETRIEVED = 0x80,
@ -151,6 +151,7 @@ private:
bool fInputLoopWaiting;
volatile bool fTerminating;
BReference<Thread> fStoppedThread;
Thread* fCurrentThread;
StackTrace* fCurrentStackTrace;
int32 fCurrentStackFrameIndex;

2
src/apps/debugger/user_interface/cli/CommandLineUserInterface.cpp
View File

@ -248,6 +248,8 @@ CommandLineUserInterface::_InputLoop()
thread_id currentThread = -1;
while (!fTerminating) {
fContext.ProcessPendingEvents();
// Wait for a thread or Ctrl-C.
fContext.WaitForThreadOrUser();
if (fContext.IsTerminating())