summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core/Logging.cpp
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2017-02-10 11:49:21 +0000
committerPavel Labath <labath@google.com>2017-02-10 11:49:21 +0000
commit5fae71c51cc8c3d51e86cd597ce91a254e9175f4 (patch)
tree07566b6e6ea25ad4cd1fe0138e69b3b15650d072 /lldb/source/Core/Logging.cpp
parent30a02088c0dcf07dcb38bc9fd2f8221154cff449 (diff)
downloadbcm5719-llvm-5fae71c51cc8c3d51e86cd597ce91a254e9175f4.tar.gz
bcm5719-llvm-5fae71c51cc8c3d51e86cd597ce91a254e9175f4.zip
Convert Log class to llvm streams
Summary: This converts LLDB's logging to use llvm streams instead of lldb_private::Stream and friends. The changes are mostly straight-forward and amount to s/lldb_private::Stream/llvm::raw_ostream. The part worth calling out is the rewrite of the StreamCallback class. Previously this class contained a per-thread buffer of data written. I assume this had something to do with it trying to make sure each log line is delivered as a single event, instead of multiple (possibly interleaved) events. However, this is no longer relevant as the Log class already writes things to a temporary buffer and then delivers the message as a single "write", so I have just removed the code in question. Reviewers: zturner, clayborg Subscribers: emaste, lldb-commits, mgorny Differential Revision: https://reviews.llvm.org/D29615 llvm-svn: 294736
Diffstat (limited to 'lldb/source/Core/Logging.cpp')
-rw-r--r--lldb/source/Core/Logging.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/lldb/source/Core/Logging.cpp b/lldb/source/Core/Logging.cpp
index 1d42df111a4..49e22c4b0c8 100644
--- a/lldb/source/Core/Logging.cpp
+++ b/lldb/source/Core/Logging.cpp
@@ -167,14 +167,15 @@ void lldb_private::DisableLog(const char **categories, Stream *feedback_strm) {
}
log->GetMask().Reset(flag_bits);
if (flag_bits == 0) {
- log->SetStream(lldb::StreamSP());
+ log->SetStream(nullptr);
g_log_enabled = false;
}
}
}
-Log *lldb_private::EnableLog(StreamSP &log_stream_sp, uint32_t log_options,
- const char **categories, Stream *feedback_strm) {
+Log *lldb_private::EnableLog(
+ const std::shared_ptr<llvm::raw_ostream> &log_stream_sp,
+ uint32_t log_options, const char **categories, Stream *feedback_strm) {
// Try see if there already is a log - that way we can reuse its settings.
// We could reuse the log in toto, but we don't know that the stream is the
// same.
OpenPOWER on IntegriCloud