Skip to content

Commit

Permalink
Fix race condition with -o "process launch" on linux
Browse files Browse the repository at this point in the history
Summary:
starting a debug session on linux with -o "process launch" lldb parameter was failing since
Target::Launch (in sychronous mode) is expecting to be able to receive public process events.
However, PlatformLinux did not set up event hijacking on process launch, which caused these
events to be processed elsewhere and left Target::Launch hanging. This patch enables event
interception in PlatformLinux (which was commented out).

Upon enabling event interception, I noticed an issue, which I traced back to the inconsistent
state of public run lock, which remained false even though public and private process states were
"stopped". I addressed this by making sure the run lock is "stopped" upon exit from
WaitForProcessToStop (which already had similar provisions for other return paths).

Test Plan: This should fix the intermittent TestFormats failure we have been experiencing on Linux.

Reviewers: jingham, clayborg, vharron

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D8079

llvm-svn: 231460
  • Loading branch information
labath committed Mar 6, 2015
1 parent 6adbd7a commit 78521ef
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 0 additions & 3 deletions lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
Expand Up @@ -765,7 +765,6 @@ PlatformLinux::DebugProcess (ProcessLaunchInfo &launch_info,

// Adjust launch for a hijacker.
ListenerSP listener_sp;
#if 0
if (!launch_info.GetHijackListener ())
{
if (log)
Expand All @@ -775,7 +774,6 @@ PlatformLinux::DebugProcess (ProcessLaunchInfo &launch_info,
launch_info.SetHijackListener (listener_sp);
process_sp->HijackProcessEvents (listener_sp.get ());
}
#endif

// Log file actions.
if (log)
Expand All @@ -801,7 +799,6 @@ PlatformLinux::DebugProcess (ProcessLaunchInfo &launch_info,
if (listener_sp)
{
const StateType state = process_sp->WaitForProcessToStop (NULL, NULL, false, listener_sp.get());
process_sp->RestoreProcessEvents();

if (state == eStateStopped)
{
Expand Down
4 changes: 4 additions & 0 deletions lldb/source/Target/Process.cpp
Expand Up @@ -1011,6 +1011,10 @@ Process::WaitForProcessToStop (const TimeValue *timeout,
if (log)
log->Printf("Process::%s returning without waiting for events; process private and public states are already 'stopped'.",
__FUNCTION__);
// We need to toggle the run lock as this won't get done in
// SetPublicState() if the process is hijacked.
if (hijack_listener)
m_public_run_lock.SetStopped();
return state;
}

Expand Down

0 comments on commit 78521ef

Please sign in to comment.