Use atomic operations for setting/reading the trace filter.
The filter is currently being set and read by a number of threads and tripping up tsan.
R=mflodman@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/47609004
Cr-Commit-Position: refs/heads/master@{#8753}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8753 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc
index c41159d..6a293cc 100644
--- a/webrtc/system_wrappers/source/trace_impl.cc
+++ b/webrtc/system_wrappers/source/trace_impl.cc
@@ -32,7 +32,7 @@
const int Trace::kBoilerplateLength = 71;
const int Trace::kTimestampPosition = 13;
const int Trace::kTimestampLength = 12;
-uint32_t Trace::level_filter_ = kTraceDefault;
+volatile int Trace::level_filter_ = kTraceDefault;
// Construct On First Use idiom. Avoids "static initialization order fiasco".
TraceImpl* TraceImpl::StaticInstance(CountOperation count_operation,
@@ -518,14 +518,17 @@
return true;
}
+// static
void Trace::CreateTrace() {
TraceImpl::StaticInstance(kAddRef);
}
+// static
void Trace::ReturnTrace() {
TraceImpl::StaticInstance(kRelease);
}
+// static
int32_t Trace::TraceFile(char file_name[FileWrapper::kMaxFileNameSize]) {
TraceImpl* trace = TraceImpl::GetTrace();
if (trace) {
@@ -536,6 +539,17 @@
return -1;
}
+// static
+void Trace::set_level_filter(int filter) {
+ rtc::AtomicOps::Store(&level_filter_, filter);
+}
+
+// static
+int Trace::level_filter() {
+ return rtc::AtomicOps::Load(&level_filter_);
+}
+
+// static
int32_t Trace::SetTraceFile(const char* file_name,
const bool add_file_counter) {
TraceImpl* trace = TraceImpl::GetTrace();