06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Fri, 9 Jul 2021 18:14:00 -0500
|
|
Subject: Bug 1654112 - mutex changes to fix tsan errors. r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D119674
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/3d5503acf9a4b22e02c4300f29e4fbfed406ea2c
|
|
---
|
|
rtc_base/logging.cc | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/rtc_base/logging.cc b/rtc_base/logging.cc
|
|
index f8ff475e5d..91bc47c6fe 100644
|
|
--- a/rtc_base/logging.cc
|
|
+++ b/rtc_base/logging.cc
|
|
@@ -275,8 +275,8 @@ void LogMessage::LogTimestamps(bool on) {
|
|
}
|
|
|
|
void LogMessage::LogToDebug(LoggingSeverity min_sev) {
|
|
- g_dbg_sev = min_sev;
|
|
webrtc::MutexLock lock(&GetLoggingLock());
|
|
+ g_dbg_sev = min_sev;
|
|
UpdateMinLogSeverity();
|
|
}
|
|
|
|
@@ -460,6 +460,9 @@ void LogMessage::OutputToDebug(const LogLineRef& log_line) {
|
|
|
|
// static
|
|
bool LogMessage::IsNoop(LoggingSeverity severity) {
|
|
+ // Added MutexLock to fix tsan warnings on accessing g_dbg_sev. (mjf)
|
|
+ // See https://bugs.chromium.org/p/chromium/issues/detail?id=1228729
|
|
+ webrtc::MutexLock lock(&GetLoggingLock());
|
|
if (severity >= g_dbg_sev || severity >= g_min_sev)
|
|
return false;
|
|
return streams_empty_.load(std::memory_order_relaxed);
|