mirror of
https://github.com/intel/llvm.git
synced 2026-01-15 04:17:17 +08:00
Add a "force_kill" arg to Process::Destroy(). This is needed after
the changes in r233255/r233258. Normally if lldb attaches to a running process, when we call Process::Destroy, we want to detach from the process. If lldb launched the process itself, ::Destroy should kill it. However, if we attach to a process and the driver calls SBProcess::Kill() (which calls Destroy), we need to kill it even if we didn't launch it originally. The force_kill param allows for the SBProcess::Kill method to force the behavior of Destroy. <rdar://problem/20424439> llvm-svn: 235158
This commit is contained in:
@@ -768,7 +768,7 @@ SBProcess::Destroy ()
|
||||
if (process_sp)
|
||||
{
|
||||
Mutex::Locker api_locker (process_sp->GetTarget().GetAPIMutex());
|
||||
sb_error.SetError(process_sp->Destroy());
|
||||
sb_error.SetError(process_sp->Destroy(false));
|
||||
}
|
||||
else
|
||||
sb_error.SetErrorString ("SBProcess is invalid");
|
||||
@@ -821,7 +821,7 @@ SBProcess::Kill ()
|
||||
if (process_sp)
|
||||
{
|
||||
Mutex::Locker api_locker (process_sp->GetTarget().GetAPIMutex());
|
||||
sb_error.SetError (process_sp->Destroy());
|
||||
sb_error.SetError (process_sp->Destroy(true));
|
||||
}
|
||||
else
|
||||
sb_error.SetErrorString ("SBProcess is invalid");
|
||||
|
||||
Reference in New Issue
Block a user