Allow multiple logging::LogMessage{Handler,Listener}s

base/logging.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 
 #include <limits.h>
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 31 matching lines @@
 #include <sys/stat.h>
 #include <unistd.h>
 #define MAX_PATH PATH_MAX
 typedef FILE* FileHandle;
 typedef pthread_mutex_t* MutexHandle;
 #endif
 
 #include <algorithm>
 #include <cstring>
 #include <ctime>
+#include <deque>
 #include <iomanip>
 #include <ostream>
 #include <string>
+#include <unordered_set>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
+#include "base/lazy_instance.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/synchronization/lock.h"
 #include "base/synchronization/lock_impl.h"
 #include "base/threading/platform_thread.h"
 #include "base/vlog.h"
 #if defined(OS_POSIX)
 #include "base/posix/safe_strerror.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include <android/log.h>
 #endif
@@ skipping 39 matching lines @@
 bool g_log_thread_id = false;
 bool g_log_timestamp = true;
 bool g_log_tickcount = false;
 
 // Should we pop up fatal debug messages in a dialog?
 bool show_error_dialogs = false;
 
 // An assert handler override specified by the client to be called instead of
 // the debug message dialog and process termination.
 LogAssertHandlerFunction log_assert_handler = nullptr;
-// A log message handler that gets notified of every log message we process.
-LogMessageHandlerFunction log_message_handler = nullptr;
+// Log message handlers that get notified of every log message we process.
+base::LazyInstance<std::deque<LogMessageHandler*>>::Leaky
+    log_message_handlers = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<base::Lock>::Leaky log_message_handler_lock;

[grt (UTC plus 2), 2016/08/05 20:13:30]

 = LAZY_INSTANCE_INITIALIZER

[wychen, 2016/08/12 21:32:39]

Done.

+// Log message listeners that get notified of every log message we process
+// before log message handlers.
+base::LazyInstance<std::unordered_set<LogMessageListener*>>::Leaky
+    log_message_listeners = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<base::Lock>::Leaky log_message_listener_lock;

[grt (UTC plus 2), 2016/08/05 20:13:30]

 = LAZY_INSTANCE_INITIALIZER

[wychen, 2016/08/12 21:32:39]

Done.

 
 // Helper functions to wrap platform differences.
 
 int32_t CurrentProcessId() {
 #if defined(OS_WIN)
   return GetCurrentProcessId();
 #elif defined(OS_POSIX)
   return getpid();
 #endif
 }
@@ skipping 197 matching lines @@
 void CloseLogFileUnlocked() {
   if (!g_log_file)
     return;
 
   CloseFile(g_log_file);
   g_log_file = nullptr;
 }
 
 }  // namespace
 
+LogMessageHandler::LogMessageHandler() {
+  base::AutoLock lock(log_message_handler_lock.Get());
+  log_message_handlers.Get().push_front(this);
+}
+
+LogMessageHandler::~LogMessageHandler() {
+  base::AutoLock lock(log_message_handler_lock.Get());
+  auto& handlers = log_message_handlers.Get();
+  size_t count = handlers.size();
+  handlers.erase(std::remove(handlers.begin(), handlers.end(), this),
+      handlers.end());
+  DCHECK_EQ(count - 1, handlers.size());
+}
+
+size_t LogMessageHandlerCountForTesting() {
+  base::AutoLock lock(log_message_handler_lock.Get());
+  return log_message_handlers.Get().size();
+}
+
+LogMessageListener::LogMessageListener() {
+  base::AutoLock lock(log_message_listener_lock.Get());
+  log_message_listeners.Get().insert(this);
+}
+
+LogMessageListener::~LogMessageListener() {
+  base::AutoLock lock(log_message_listener_lock.Get());
+  size_t erased_count = log_message_listeners.Get().erase(this);
+  DCHECK_EQ(1u, erased_count);
+}
+
+size_t LogMessageListenerCountForTesting() {
+  base::AutoLock lock(log_message_listener_lock.Get());
+  return log_message_listeners.Get().size();
+}
+
 LoggingSettings::LoggingSettings()
     : logging_dest(LOG_DEFAULT),
       log_file(nullptr),
       lock_log(LOCK_LOG_FILE),
       delete_old(APPEND_TO_OLD_LOG_FILE) {}
 
 bool BaseInitLoggingImpl(const LoggingSettings& settings) {
 #if defined(OS_NACL)
   // Can log only to the system debug log.
   CHECK_EQ(settings.logging_dest & ~LOG_TO_SYSTEM_DEBUG_LOG, 0);
@@ skipping 47 matching lines @@
   return g_min_log_level;
 }
 
 bool ShouldCreateLogMessage(int severity) {
   if (severity < g_min_log_level)
     return false;
 
   // Return true here unless we know ~LogMessage won't do anything. Note that
   // ~LogMessage writes to stderr if severity_ >= kAlwaysPrintErrorLevel, even
   // when g_logging_destination is LOG_NONE.
-  return g_logging_destination != LOG_NONE || log_message_handler ||
+  return g_logging_destination != LOG_NONE ||
+         !log_message_handlers.Get().empty() ||

[grt (UTC plus 2), 2016/08/05 20:13:30]

i don't think this is safe to do outside of the lock.

[wychen, 2016/08/12 21:32:39]

Done.

+         !log_message_listeners.Get().empty() ||
          severity >= kAlwaysPrintErrorLevel;
 }
 
 int GetVlogVerbosity() {
   return std::max(-1, LOG_INFO - GetMinLogLevel());
 }
 
 int GetVlogLevelHelper(const char* file, size_t N) {
   DCHECK_GT(N, 0U);
   // Note: |g_vlog_info| may change on a different thread during startup
@@ skipping 13 matching lines @@
 }
 
 void SetShowErrorDialogs(bool enable_dialogs) {
   show_error_dialogs = enable_dialogs;
 }
 
 void SetLogAssertHandler(LogAssertHandlerFunction handler) {
   log_assert_handler = handler;
 }
 
-void SetLogMessageHandler(LogMessageHandlerFunction handler) {
-  log_message_handler = handler;
-}
-
-LogMessageHandlerFunction GetLogMessageHandler() {
-  return log_message_handler;
-}
-
 // Explicit instantiations for commonly used comparisons.
 template std::string* MakeCheckOpString<int, int>(
     const int&, const int&, const char* names);
 template std::string* MakeCheckOpString<unsigned long, unsigned long>(
     const unsigned long&, const unsigned long&, const char* names);
 template std::string* MakeCheckOpString<unsigned long, unsigned int>(
     const unsigned long&, const unsigned int&, const char* names);
 template std::string* MakeCheckOpString<unsigned int, unsigned long>(
     const unsigned int&, const unsigned long&, const char* names);
 template std::string* MakeCheckOpString<std::string, std::string>(
@@ skipping 66 matching lines @@
   if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
     // Include a stack trace on a fatal, unless a debugger is attached.
     base::debug::StackTrace trace;
     stream_ << std::endl;  // Newline to separate from log message.
     trace.OutputToStream(&stream_);
   }
 #endif
   stream_ << std::endl;
   std::string str_newline(stream_.str());
 
-  // Give any log message handler first dibs on the message.
-  if (log_message_handler &&
-      log_message_handler(severity_, file_, line_,
-                          message_start_, str_newline)) {
-    // The handler took care of it, no further processing.
-    return;
+  {
+    base::AutoLock lock(log_message_listener_lock.Get());
+    // Broadcast to log message listeners first.
+    for (auto* listener : log_message_listeners.Get()) {
+      listener->OnMessage(severity_, file_, line_, message_start_, str_newline);
+    }
+  }
+
+  {
+    base::AutoLock lock(log_message_handler_lock.Get());
+    // Give log message handlers first dibs on the message.
+    for (auto* handler : log_message_handlers.Get()) {
+      if (handler->OnMessage(severity_, file_, line_, message_start_,
+          str_newline)) {
+        // The handler took care of it, no further processing.
+        return;
+      }
+    }
   }
 
   if ((g_logging_destination & LOG_TO_SYSTEM_DEBUG_LOG) != 0) {
 #if defined(OS_WIN)
     OutputDebugStringA(str_newline.c_str());
 #elif defined(OS_MACOSX)
     // In LOG_TO_SYSTEM_DEBUG_LOG mode, log messages are always written to
     // stderr. If stderr is /dev/null, also log via ASL (Apple System Log). If
     // there's something weird about stderr, assume that log messages are going
     // nowhere and log via ASL too. Messages logged via ASL show up in
@@ skipping 365 matching lines @@
 BASE_EXPORT void LogErrorNotReached(const char* file, int line) {
   LogMessage(file, line, LOG_ERROR).stream()
       << "NOTREACHED() hit.";
 }
 
 }  // namespace logging
 
 std::ostream& std::operator<<(std::ostream& out, const wchar_t* wstr) {
   return out << (wstr ? base::WideToUTF8(wstr) : std::string());
 }