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

Don't have both lldb and debugserver call waitpid on the target process. This sets up a race condition, 

and if lldb wins, then debugserver won't get the correct error status to lldb.

<rdar://problem/16030008>

llvm-svn: 201744
This commit is contained in:
Jim Ingham 2014-02-20 00:52:37 +00:00
parent 5a0dd572a8
commit ff26163768
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/include/lldb/Target/Process.h
View File

@ -815,9 +815,16 @@ public:
return m_monitor_callback_baton;
}
// If the LaunchInfo has a monitor callback, then arrange to monitor the process.
// Return true if the LaunchInfo has taken care of monitoring the process, and false if the
// caller might want to monitor the process themselves.
bool
MonitorProcess () const
{
if (GetFlags().Test(lldb::eLaunchFlagsDontMonitorProcess))
return true;
if (m_monitor_callback && ProcessIDIsValid())
{
Host::StartMonitoringChildProcess (m_monitor_callback,

4
lldb/include/lldb/lldb-enumerations.h
View File

@ -46,7 +46,9 @@ namespace lldb {
eLaunchFlagDisableSTDIO = (1u << 4), ///< Disable stdio for inferior process (e.g. for a GUI app)
eLaunchFlagLaunchInTTY = (1u << 5), ///< Launch the process in a new TTY if supported by the host
eLaunchFlagLaunchInShell= (1u << 6), ///< Launch the process inside a shell to get shell expansion
eLaunchFlagLaunchInSeparateProcessGroup = (1u << 7) ///< Launch the process in a separate process group
eLaunchFlagLaunchInSeparateProcessGroup = (1u << 7), ///< Launch the process in a separate process group
eLaunchFlagsDontMonitorProcess = (1u << 8) ///< If you are going to hand the process off (e.g. to debugserver)
///< set this flag so lldb & the handee don't race to reap it.
} LaunchFlags;
//----------------------------------------------------------------------

4
lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
View File

@ -763,6 +763,10 @@ PlatformDarwin::DebugProcess (ProcessLaunchInfo &launch_info,
if (IsHost())
{
// We are going to hand this process off to debugserver which will monitor the process itself.
// So don't also monitor it from lldb or we set up a race between debugserver & us for who will find out
// about the debugged process's death.
launch_info.GetFlags().Set(eLaunchFlagsDontMonitorProcess);
process_sp = Platform::DebugProcess (launch_info, debugger, target, listener, error);
}
else