Move logging CriticalSection into implementation.

webrtc/base/logging.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 36 matching lines @@
 #define WEBRTC_BASE_LOGGING_H_
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"  // NOLINT
 #endif
 
 #include <list>
 #include <sstream>
 #include <string>
 #include <utility>
+
 #include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/thread_annotations.h"
 
 namespace rtc {
 
 ///////////////////////////////////////////////////////////////////////////////
 // ConstantLabel can be used to easily generate string names from constant
 // values.  This can be useful for logging descriptive names of error messages.
 // Usage:
 //   const ConstantLabel LIBRARY_ERRORS[] = {
 //     KLABEL(SOME_ERROR),
@@ skipping 55 matching lines @@
 // Virtual sink interface that can receive log messages.
 class LogSink {
  public:
   LogSink() {}
   virtual ~LogSink() {}
   virtual void OnLogMessage(const std::string& message) = 0;
 };
 
 class LogMessage {
  public:
-  static const uint32_t WARN_SLOW_LOGS_DELAY = 50;  // ms
-
   LogMessage(const char* file, int line, LoggingSeverity sev,
              LogErrorContext err_ctx = ERRCTX_NONE, int err = 0,
              const char* module = NULL);
 
   LogMessage(const char* file,
              int line,
              LoggingSeverity sev,
              const std::string& tag);
 
   ~LogMessage();
@@ skipping 43 matching lines @@
 
   // Parses the provided parameter stream to configure the options above.
   // Useful for configuring logging from the command line.
   static void ConfigureLogging(const char* params);
 
  private:
   typedef std::pair<LogSink*, LoggingSeverity> StreamAndSeverity;
   typedef std::list<StreamAndSeverity> StreamList;
 
   // Updates min_sev_ appropriately when debug sinks change.
-  static void UpdateMinLogSeverity() EXCLUSIVE_LOCKS_REQUIRED(crit_);
+  static void UpdateMinLogSeverity();
 
   // These write out the actual log messages.
   static void OutputToDebug(const std::string& msg,
                             LoggingSeverity severity,
                             const std::string& tag);
 
   // The ostream that buffers the formatted message before output
   std::ostringstream print_stream_;
 
   // The severity level of this message
   LoggingSeverity severity_;
 
   // The Android debug output tag.
   std::string tag_;
 
   // String data generated in the constructor, that should be appended to
   // the message before output.
   std::string extra_;
 
-  // If time it takes to write to stream is more than this, log one
-  // additional warning about it.
-  uint32_t warn_slow_logs_delay_;
-
-  // Global lock for the logging subsystem
-  static CriticalSection crit_;
-
   // dbg_sev_ is the thresholds for those output targets
   // min_sev_ is the minimum (most verbose) of those levels, and is used
   //  as a short-circuit in the logging macros to identify messages that won't
   //  be logged.
   // ctx_sev_ is the minimum level at which file context is displayed
   static LoggingSeverity min_sev_, dbg_sev_, ctx_sev_;
 
   // The output streams and their associated severities
   static StreamList streams_;
 
@@ skipping 123 matching lines @@
 #define PLOG(sev, err) \
   LOG_ERR_EX(sev, err)
 
 // TODO(?): Add an "assert" wrapper that logs in the same manner.
 
 #endif  // LOG
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_LOGGING_H_