summaryrefslogtreecommitdiffstats
path: root/lldb/source/lldb-log.cpp
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2014-02-13 23:34:38 +0000
committerGreg Clayton <gclayton@apple.com>2014-02-13 23:34:38 +0000
commite98008cc587749568a6661931ed8973b64f7c2f7 (patch)
treeedd79f6e2f5e7e6d92a76d7bb14f28ddab54bb95 /lldb/source/lldb-log.cpp
parent967bf5813fb609940fa06510ad70d48268c362d5 (diff)
downloadbcm5719-llvm-e98008cc587749568a6661931ed8973b64f7c2f7.tar.gz
bcm5719-llvm-e98008cc587749568a6661931ed8973b64f7c2f7.zip
Fixed deadlocks that could occur when using python for breakpoints, operating system plugins, and other async python usage.
<rdar://problem/16054348> <rdar://problem/16040833> llvm-svn: 201372
Diffstat (limited to 'lldb/source/lldb-log.cpp')
-rw-r--r--lldb/source/lldb-log.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/lldb/source/lldb-log.cpp b/lldb/source/lldb-log.cpp
index c00d2e649e2..12ec3a546e1 100644
--- a/lldb/source/lldb-log.cpp
+++ b/lldb/source/lldb-log.cpp
@@ -156,7 +156,10 @@ lldb_private::DisableLog (const char **categories, Stream *feedback_strm)
}
log->GetMask().Reset (flag_bits);
if (flag_bits == 0)
+ {
+ log->SetStream(lldb::StreamSP());
g_log_enabled = false;
+ }
}
return;
OpenPOWER on IntegriCloud