Some cleanup for base/logging and base/stream.h
* Fix race when calling UpdateMinLogSeverity
* Remove unused 'diagnostic mode'
* Remove LogToStream
* Fix ctor of StringStream
* Delete POpenStream
* Delete AsyncWriteStream
* Delete CircularFileStream
* Delete StreamSegment
BUG=
R=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/57429004
Cr-Commit-Position: refs/heads/master@{#9273}
diff --git a/webrtc/base/logging.cc b/webrtc/base/logging.cc
index f5bcd68..1ac1373 100644
--- a/webrtc/base/logging.cc
+++ b/webrtc/base/logging.cc
@@ -91,14 +91,11 @@
// Note: we explicitly do not clean this up, because of the uncertain ordering
// of destructors at program exit. Let the person who sets the stream trigger
// cleanup by setting to NULL, or let it leak (safe at program exit).
-LogMessage::StreamList LogMessage::streams_;
+LogMessage::StreamList LogMessage::streams_ GUARDED_BY(LogMessage::crit_);
// Boolean options default to false (0)
bool LogMessage::thread_, LogMessage::timestamp_;
-// If we're in diagnostic mode, we'll be explicitly set that way; default=false.
-bool LogMessage::is_diagnostic_mode_ = false;
-
LogMessage::LogMessage(const char* file, int line, LoggingSeverity sev,
LogErrorContext err_ctx, int err, const char* module)
: severity_(sev),
@@ -214,20 +211,8 @@
void LogMessage::LogToDebug(LoggingSeverity min_sev) {
dbg_sev_ = min_sev;
- UpdateMinLogSeverity();
-}
-
-void LogMessage::LogToStream(LogSink* stream, LoggingSeverity min_sev) {
CritScope cs(&crit_);
- // Discard and delete all previously installed streams
- for (StreamList::iterator it = streams_.begin(); it != streams_.end(); ++it) {
- delete it->first;
- }
- streams_.clear();
- // Install the new stream, if specified
- if (stream) {
- AddLogToStream(stream, min_sev);
- }
+ UpdateMinLogSeverity();
}
int LogMessage::GetLogToStream(LogSink* stream) {
@@ -320,7 +305,7 @@
LogToDebug(debug_level);
}
-void LogMessage::UpdateMinLogSeverity() {
+void LogMessage::UpdateMinLogSeverity() EXCLUSIVE_LOCKS_REQUIRED(crit_) {
LoggingSeverity min_sev = dbg_sev_;
for (StreamList::iterator it = streams_.begin(); it != streams_.end(); ++it) {
min_sev = std::min(dbg_sev_, it->second);