admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert lock for logging to CriticalSection

Browse Source 
This reverts commit I5b9d9036aa90eb0c652f6b17ea1162dea0362640

using spin lock (Global lock) for highly used lock may cause deadlock on ios

Bug: None
Change-Id: Ia7594d665bc17717299245b1a6cfcff18f273e77
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160200
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29857}
This commit is contained in:
Danil Chapovalov 2019-11-21 10:07:57 +01:00 committed by Commit Bot
parent 9982efa830
commit ec22183f43
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtc_base/logging.cc
View File

@ -68,7 +68,7 @@ const char* FilenameFromPath(const char* file) {
} }
// Global lock for log subsystem, only needed to serialize access to streams_. // Global lock for log subsystem, only needed to serialize access to streams_.
ABSL_CONST_INIT GlobalLock g_log_crit; CriticalSection g_log_crit;
} // namespace } // namespace
// Inefficient default implementation, override is recommended. // Inefficient default implementation, override is recommended.
@ -201,7 +201,7 @@ LogMessage::~LogMessage() {
#endif #endif
} }
GlobalLockScope cs(&g_log_crit); CritScope cs(&g_log_crit);
for (LogSink* entry = streams_; entry != nullptr; entry = entry->next_) { for (LogSink* entry = streams_; entry != nullptr; entry = entry->next_) {
if (severity_ >= entry->min_severity_) { if (severity_ >= entry->min_severity_) {
#if defined(WEBRTC_ANDROID) #if defined(WEBRTC_ANDROID)
@ -250,7 +250,7 @@ void LogMessage::LogTimestamps(bool on) {
void LogMessage::LogToDebug(LoggingSeverity min_sev) { void LogMessage::LogToDebug(LoggingSeverity min_sev) {
g_dbg_sev = min_sev; g_dbg_sev = min_sev;
GlobalLockScope cs(&g_log_crit); CritScope cs(&g_log_crit);
UpdateMinLogSeverity(); UpdateMinLogSeverity();
} }
@ -259,7 +259,7 @@ void LogMessage::SetLogToStderr(bool log_to_stderr) {
} }
int LogMessage::GetLogToStream(LogSink* stream) { int LogMessage::GetLogToStream(LogSink* stream) {
GlobalLockScope cs(&g_log_crit); CritScope cs(&g_log_crit);
LoggingSeverity sev = LS_NONE; LoggingSeverity sev = LS_NONE;
for (LogSink* entry = streams_; entry != nullptr; entry = entry->next_) { for (LogSink* entry = streams_; entry != nullptr; entry = entry->next_) {
if (stream == nullptr || stream == entry) { if (stream == nullptr || stream == entry) {
@ -270,7 +270,7 @@ int LogMessage::GetLogToStream(LogSink* stream) {
} }
void LogMessage::AddLogToStream(LogSink* stream, LoggingSeverity min_sev) { void LogMessage::AddLogToStream(LogSink* stream, LoggingSeverity min_sev) {
GlobalLockScope cs(&g_log_crit); CritScope cs(&g_log_crit);
stream->min_severity_ = min_sev; stream->min_severity_ = min_sev;
stream->next_ = streams_; stream->next_ = streams_;
streams_ = stream; streams_ = stream;
@ -278,7 +278,7 @@ void LogMessage::AddLogToStream(LogSink* stream, LoggingSeverity min_sev) {
} }
void LogMessage::RemoveLogToStream(LogSink* stream) { void LogMessage::RemoveLogToStream(LogSink* stream) {
GlobalLockScope cs(&g_log_crit); CritScope cs(&g_log_crit);
for (LogSink** entry = &streams_; *entry != nullptr; for (LogSink** entry = &streams_; *entry != nullptr;
entry = &(*entry)->next_) { entry = &(*entry)->next_) {
if (*entry == stream) { if (*entry == stream) {
@ -447,7 +447,7 @@ bool LogMessage::IsNoop(LoggingSeverity severity) {
// TODO(tommi): We're grabbing this lock for every LogMessage instance that // TODO(tommi): We're grabbing this lock for every LogMessage instance that
// is going to be logged. This introduces unnecessary synchronization for // is going to be logged. This introduces unnecessary synchronization for
// a feature that's mostly used for testing. // a feature that's mostly used for testing.
GlobalLockScope cs(&g_log_crit); CritScope cs(&g_log_crit);
return streams_ == nullptr; return streams_ == nullptr;
} }