3 files changed, 25 insertions, 4 deletions
diff --git a/webrtc/base/criticalsection.h b/webrtc/base/criticalsection.h
index 088e72e142..8d6ddbe884 100644
--- a/webrtc/base/criticalsection.h
+++ b/webrtc/base/criticalsection.h
@@ -166,6 +166,9 @@ class AtomicOps {
   static int Load(volatile const int* i) {
     return *i;
   }
+  static void Store(volatile int* i, int value) {
+    *i = value;
+  }
 #else
   static int Increment(volatile int* i) {
     return __sync_add_and_fetch(i, 1);
@@ -177,6 +180,10 @@ class AtomicOps {
     // Adding 0 is a no-op, so const_cast is fine.
     return __sync_add_and_fetch(const_cast<volatile int*>(i), 0);
   }
+  static void Store(volatile int* i, int value) {
+    __sync_synchronize();
+    *i = value;
+  }
 #endif
 };
 
diff --git a/webrtc/system_wrappers/interface/trace.h b/webrtc/system_wrappers/interface/trace.h
index 44ea658bdf..e63b603d1b 100644
--- a/webrtc/system_wrappers/interface/trace.h
+++ b/webrtc/system_wrappers/interface/trace.h
@@ -49,10 +49,10 @@ class Trace {
   // filter parameter is a bitmask where each message type is enumerated by the
   // TraceLevel enumerator. TODO(hellner): why is the TraceLevel enumerator not
   // defined in this file?
-  static void set_level_filter(uint32_t filter) { level_filter_ = filter; }
+  static void set_level_filter(int filter);
 
   // Returns what type of messages are written to the trace file.
-  static uint32_t level_filter() { return level_filter_; }
+  static int level_filter();
 
   // Sets the file name. If add_file_counter is false the same file will be
   // reused when it fills up. If it's true a new file with incremented name
@@ -84,7 +84,7 @@ class Trace {
                   const char* msg, ...);
 
  private:
-  static uint32_t level_filter_;
+  static volatile int level_filter_;
 };
 
 }  // namespace webrtc
diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc
index c41159dae6..6a293ccbd0 100644
--- a/webrtc/system_wrappers/source/trace_impl.cc
+++ b/webrtc/system_wrappers/source/trace_impl.cc
@@ -32,7 +32,7 @@ namespace webrtc {
 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 @@ bool TraceImpl::CreateFileName(
   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 @@ int32_t Trace::TraceFile(char file_name[FileWrapper::kMaxFileNameSize]) {
   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();