Revert of Rename thread annotation macros to have RTC prefix for syncrhonization primitives.

webrtc/rtc_base/criticalsection.cc

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 38 matching lines @@
 # if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
   dispatch_release(semaphore_);
 # else
   pthread_mutex_destroy(&mutex_);
 # endif
 #else
 # error Unsupported platform.
 #endif
 }
 
-void CriticalSection::Enter() const {
+void CriticalSection::Enter() const EXCLUSIVE_LOCK_FUNCTION() {
 #if defined(WEBRTC_WIN)
   EnterCriticalSection(&crit_);
 #elif defined(WEBRTC_POSIX)
 # if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
   int spin = 3000;
   PlatformThreadRef self = CurrentThreadRef();
   bool have_lock = false;
   do {
     // Instead of calling TryEnter() in this loop, we do two interlocked
     // operations, first a read-only one in order to avoid affecting the lock
@@ skipping 38 matching lines @@
   } else {
     RTC_DCHECK(CurrentThreadIsOwner());
   }
   ++recursion_count_;
 # endif
 #else
 # error Unsupported platform.
 #endif
 }
 
-bool CriticalSection::TryEnter() const {
+bool CriticalSection::TryEnter() const EXCLUSIVE_TRYLOCK_FUNCTION(true) {
 #if defined(WEBRTC_WIN)
   return TryEnterCriticalSection(&crit_) != FALSE;
 #elif defined(WEBRTC_POSIX)
 # if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
   if (!IsThreadRefEqual(owning_thread_, CurrentThreadRef())) {
     if (AtomicOps::CompareAndSwap(&lock_queue_, 0, 1) != 0)
       return false;
     owning_thread_ = CurrentThreadRef();
     RTC_DCHECK(!recursion_);
   } else {
@@ skipping 12 matching lines @@
     RTC_DCHECK(CurrentThreadIsOwner());
   }
   ++recursion_count_;
 # endif
   return true;
 #else
 # error Unsupported platform.
 #endif
 }
 
-void CriticalSection::Leave() const {
+void CriticalSection::Leave() const UNLOCK_FUNCTION() {
   RTC_DCHECK(CurrentThreadIsOwner());
 #if defined(WEBRTC_WIN)
   LeaveCriticalSection(&crit_);
 #elif defined(WEBRTC_POSIX)
 # if CS_DEBUG_CHECKS
   --recursion_count_;
   RTC_DCHECK(recursion_count_ >= 0);
   if (!recursion_count_)
     thread_ = 0;
 # endif
@@ skipping 81 matching lines @@
 GlobalLockScope::GlobalLockScope(GlobalLockPod* lock)
     : lock_(lock) {
   lock_->Lock();
 }
 
 GlobalLockScope::~GlobalLockScope() {
   lock_->Unlock();
 }
 
 }  // namespace rtc