replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add more logging. Try to handle the case where "Halt" fails. This is kind of a losing game in the end, if we can't halt the target, it is not clear what we can do but keep trying... 

llvm-svn: 124017
This commit is contained in:
Jim Ingham 2011-01-22 01:30:53 +00:00
parent e54defe4a3
commit e22e88b8a8
1 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lldb/source/Target/Process.cpp
View File

@ -2651,7 +2651,9 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
single_thread_timeout_usec);
}
if (exe_ctx.process->Halt().Success())
Error halt_error = exe_ctx.process->Halt();
if (halt_error.Success())
{
timeout_ptr = NULL;
if (log)
@ -2698,6 +2700,22 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
}
}
}
else
{
if (log)
log->Printf ("Halt failed: \"%s\", I'm just going to wait a little longer and see if the world gets nicer to me.",
halt_error.AsCString());
if (single_thread_timeout_usec != 0)
{
real_timeout = TimeValue::Now();
real_timeout.OffsetWithMicroSeconds(single_thread_timeout_usec);
timeout_ptr = &real_timeout;
}
continue;
}
}
stop_state = Process::ProcessEventData::GetStateFromEvent(event_sp.get());
@ -2722,7 +2740,13 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
if (log)
{
StreamString s;
event_sp->Dump (&s);
if (event_sp)
event_sp->Dump (&s);
else
{
log->Printf ("Stop event that interrupted us is NULL.");
}
StreamString ts;
const char *event_explanation;
@ -2764,7 +2788,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
continue;
}
ts.Printf("<");
ts.Printf("<0x%4.4x ", thread->GetID());
RegisterContext *register_context = thread->GetRegisterContext().get();
if (register_context)
@ -2785,8 +2809,26 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
event_explanation = ts.GetData();
} while (0);
if (log)
log->Printf("Execution interrupted: %s %s", s.GetData(), event_explanation);
// See if any of the threads that stopped think we ought to stop. Otherwise continue on.
if (!GetThreadList().ShouldStop(event_sp.get()))
{
if (log)
log->Printf("Execution interrupted, but nobody wanted to stop, so we continued: %s %s",
s.GetData(), event_explanation);
if (single_thread_timeout_usec != 0)
{
real_timeout = TimeValue::Now();
real_timeout.OffsetWithMicroSeconds(single_thread_timeout_usec);
timeout_ptr = &real_timeout;
}
continue;
}
else
{
if (log)
log->Printf("Execution interrupted: %s %s", s.GetData(), event_explanation);
}
}
if (discard_on_error && thread_plan_sp)