Reland "Consolidate loggability checks and replace streams."
Currently we check if a message should be printed at the call site using LogMessage::Loggable, in the LogMessage itself using LogMessage::IsNoop and in LogMessage::OutputToDebug using log_to_stderr_.
This change unifies the first two of these into a early return in Log().
Bug: webrtc:8982
Change-Id: I462b1cf63c44fec46e5c59b147b2b99605aaae0c
Reviewed-on: https://webrtc-review.googlesource.com/98820
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24630}diff --git a/rtc_base/logging.h b/rtc_base/logging.h
index f61ae53..1a14c33 100644
--- a/rtc_base/logging.h
+++ b/rtc_base/logging.h
@@ -57,6 +57,7 @@
#include "rtc_base/constructormagic.h"
#include "rtc_base/deprecation.h"
+#include "rtc_base/strings/string_builder.h"
#include "rtc_base/system/inline.h"
#include "rtc_base/thread_annotations.h"
@@ -407,18 +408,7 @@
void AddTag(const char* tag);
- static bool Loggable(LoggingSeverity sev);
-
- // Same as the above, but using a template argument instead of a function
- // argument. (When the logging severity is statically known, passing it as a
- // template argument instead of as a function argument saves space at the
- // call site.)
- template <LoggingSeverity S>
- RTC_NO_INLINE static bool Loggable() {
- return Loggable(S);
- }
-
- std::ostream& stream();
+ rtc::StringBuilder& stream();
// Returns the time at which this function was called for the first time.
// The time will be used as the logging start time.
@@ -464,6 +454,12 @@
// Useful for configuring logging from the command line.
static void ConfigureLogging(const char* params);
+ // Checks the current global debug severity and if the |streams_| collection
+ // is empty. If |severity| is smaller than the global severity and if the
+ // |streams_| collection is empty, the LogMessage will be considered a noop
+ // LogMessage.
+ static bool IsNoop(LoggingSeverity severity);
+
private:
friend class LogMessageForTesting;
typedef std::pair<LogSink*, LoggingSeverity> StreamAndSeverity;
@@ -481,18 +477,12 @@
static void OutputToDebug(const std::string& msg, LoggingSeverity severity);
#endif
- // Checks the current global debug severity and if the |streams_| collection
- // is empty. If |severity| is smaller than the global severity and if the
- // |streams_| collection is empty, the LogMessage will be considered a noop
- // LogMessage.
- static bool IsNoop(LoggingSeverity severity);
-
// Called from the dtor (or from a test) to append optional extra error
// information to the log stream and a newline character.
void FinishPrintStream();
- // The ostream that buffers the formatted message before output
- std::ostringstream print_stream_;
+ // The stringbuilder that buffers the formatted message before output
+ rtc::StringBuilder print_stream_;
// The severity level of this message
LoggingSeverity severity_;
@@ -506,8 +496,6 @@
// the message before output.
std::string extra_;
- const bool is_noop_;
-
// The output streams and their associated severities
static StreamList streams_;
@@ -527,12 +515,11 @@
// DEPRECATED.
// TODO(bugs.webrtc.org/9278): Remove once there are no more users.
#define RTC_LOG_SEVERITY_PRECONDITION(sev) \
- !(rtc::LogMessage::Loggable(sev)) \
+ (rtc::LogMessage::IsNoop(sev)) \
? static_cast<void>(0) \
: rtc::webrtc_logging_impl::LogMessageVoidify()&
#define RTC_LOG_FILE_LINE(sev, file, line) \
- for (bool do_log = rtc::LogMessage::Loggable<sev>(); do_log; do_log = false) \
rtc::webrtc_logging_impl::LogCall() & \
rtc::webrtc_logging_impl::LogStreamer<>() \
<< rtc::webrtc_logging_impl::LogMetadata(__FILE__, __LINE__, sev)
@@ -540,11 +527,7 @@
#define RTC_LOG(sev) RTC_LOG_FILE_LINE(rtc::sev, __FILE__, __LINE__)
// The _V version is for when a variable is passed in.
-#define RTC_LOG_V(sev) \
- for (bool do_log = rtc::LogMessage::Loggable(sev); do_log; do_log = false) \
- rtc::webrtc_logging_impl::LogCall() & \
- rtc::webrtc_logging_impl::LogStreamer<>() \
- << rtc::webrtc_logging_impl::LogMetadata(__FILE__, __LINE__, sev)
+#define RTC_LOG_V(sev) RTC_LOG_FILE_LINE(sev, __FILE__, __LINE__)
// The _F version prefixes the message with the current function name.
#if (defined(__GNUC__) && !defined(NDEBUG)) || defined(WANT_PRETTY_LOG_F)
@@ -564,8 +547,6 @@
}
#define RTC_LOG_E(sev, ctx, err) \
- for (bool do_log = rtc::LogMessage::Loggable<rtc::sev>(); do_log; \
- do_log = false) \
rtc::webrtc_logging_impl::LogCall() & \
rtc::webrtc_logging_impl::LogStreamer<>() \
<< rtc::webrtc_logging_impl::LogMetadataErr { \
@@ -603,7 +584,6 @@
} // namespace webrtc_logging_impl
#define RTC_LOG_TAG(sev, tag) \
- for (bool do_log = rtc::LogMessage::Loggable(sev); do_log; do_log = false) \
rtc::webrtc_logging_impl::LogCall() & \
rtc::webrtc_logging_impl::LogStreamer<>() \
<< rtc::webrtc_logging_impl::LogMetadataTag { \