summaryrefslogtreecommitdiffstats
path: root/lldb/source/API
diff options
context:
space:
mode:
authorJason Molenda <jmolenda@apple.com>2015-04-17 05:01:58 +0000
committerJason Molenda <jmolenda@apple.com>2015-04-17 05:01:58 +0000
commitede3193bbd336bd817b918b348243fc3bfc3ab6b (patch)
tree895b41ba17b787373ca6c6ac5b10ebeb2d040bb8 /lldb/source/API
parent66eda7323c8e627d8e796c6fac012d99d6fa3341 (diff)
downloadbcm5719-llvm-ede3193bbd336bd817b918b348243fc3bfc3ab6b.tar.gz
bcm5719-llvm-ede3193bbd336bd817b918b348243fc3bfc3ab6b.zip
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
Diffstat (limited to 'lldb/source/API')
-rw-r--r--lldb/source/API/SBProcess.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp
index d979db77eba..aad3f85ae63 100644
--- a/lldb/source/API/SBProcess.cpp
+++ b/lldb/source/API/SBProcess.cpp
@@ -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");
OpenPOWER on IntegriCloud