No compliation-flag-dependent members in CriticalSection

webrtc/base/criticalsection.h

 /*
  *  Copyright 2004 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.
  */
 
 #ifndef WEBRTC_BASE_CRITICALSECTION_H_
 #define WEBRTC_BASE_CRITICALSECTION_H_
 
 #include "webrtc/base/atomicops.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/platform_thread_types.h"
 #include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/platform_thread_types.h"
+#include "webrtc/typedefs.h"
 
 #if defined(WEBRTC_WIN)
 // Include winsock2.h before including <windows.h> to maintain consistency with
 // win32.h.  We can't include win32.h directly here since it pulls in
 // headers such as basictypes.h which causes problems in Chromium where webrtc
 // exists as two separate projects, webrtc and libjingle.
 #include <winsock2.h>
 #include <windows.h>
 #include <sal.h>  // must come after windows headers.
 #endif  // defined(WEBRTC_WIN)
@@ skipping 42 matching lines @@
   // Number of times the lock has been locked + number of threads waiting.
   // TODO(tommi): We could use this number and subtract the recursion count
   // to find places where we have multiple threads contending on the same lock.
   mutable volatile int lock_queue_;
   // |recursion_| represents the recursion count + 1 for the thread that owns
   // the lock. Only modified by the thread that owns the lock.
   mutable int recursion_;
   // Used to signal a single waiting thread when the lock becomes available.
   mutable dispatch_semaphore_t semaphore_;
   // The thread that currently holds the lock. Required to handle recursion.
   mutable PlatformThreadRef owning_thread_;

[nisse-webrtc, 2017/06/26 12:53:09]

As discussed offline, it would make sense to me to unify owning_thread_/thread_
and recursion_/recursion_count_, but in a separate cl.

[eladalon, 2017/06/26 13:38:12]

I'll leave this until we take care of the TODO at the top of the .cc file; I'm
afraid to change such critical (no pun intended) code while it's this
unreadable.

 #else
   mutable pthread_mutex_t mutex_;
 #endif
-  CS_DEBUG_CODE(mutable PlatformThreadRef thread_);
-  CS_DEBUG_CODE(mutable int recursion_count_);
+  mutable PlatformThreadRef thread_;
+  mutable int recursion_count_;
 #endif
 };
 
 // CritScope, for serializing execution through a scope.
 class SCOPED_LOCKABLE CritScope {
  public:
   explicit CritScope(const CriticalSection* cs) EXCLUSIVE_LOCK_FUNCTION(cs);
   ~CritScope() UNLOCK_FUNCTION();
  private:
   const CriticalSection* const cs_;
@@ skipping 12 matching lines @@
   explicit TryCritScope(const CriticalSection* cs);
   ~TryCritScope();
 #if defined(WEBRTC_WIN)
   _Check_return_ bool locked() const;
 #else
   bool locked() const __attribute__ ((__warn_unused_result__));
 #endif
  private:
   const CriticalSection* const cs_;
   const bool locked_;
-  CS_DEBUG_CODE(mutable bool lock_was_called_);
+  mutable bool lock_was_called_;
   RTC_DISALLOW_COPY_AND_ASSIGN(TryCritScope);
 };
 
 // A POD lock used to protect global variables. Do NOT use for other purposes.
 // No custom constructor or private data member should be added.
 class LOCKABLE GlobalLockPod {
  public:
   void Lock() EXCLUSIVE_LOCK_FUNCTION();
 
   void Unlock() UNLOCK_FUNCTION();
@@ skipping 12 matching lines @@
   explicit GlobalLockScope(GlobalLockPod* lock) EXCLUSIVE_LOCK_FUNCTION(lock);
   ~GlobalLockScope() UNLOCK_FUNCTION();
  private:
   GlobalLockPod* const lock_;
   RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope);
 };
 
 } // namespace rtc
 
 #endif // WEBRTC_BASE_CRITICALSECTION_H_