From ede3193bbd336bd817b918b348243fc3bfc3ab6b Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Fri, 17 Apr 2015 05:01:58 +0000 Subject: 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. llvm-svn: 235158 --- lldb/source/Commands/CommandObjectProcess.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lldb/source/Commands/CommandObjectProcess.cpp') diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp index 487a97915a8c..c9d921035531 100644 --- a/lldb/source/Commands/CommandObjectProcess.cpp +++ b/lldb/source/Commands/CommandObjectProcess.cpp @@ -93,7 +93,7 @@ protected: } else { - Error destroy_error (process->Destroy()); + Error destroy_error (process->Destroy(false)); if (destroy_error.Success()) { result.SetStatus (eReturnStatusSuccessFinishResult); @@ -1466,7 +1466,7 @@ protected: if (command.GetArgumentCount() == 0) { - Error error (process->Destroy()); + Error error (process->Destroy(false)); if (error.Success()) { result.SetStatus (eReturnStatusSuccessFinishResult); -- cgit v1.2.3