make debug mode ~20% faster on linux

base/synchronization/lock.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file is used for debugging assertion support.  The Lock class
 // is functionally a wrapper around the LockImpl class, so the only
 // real intelligence in the class is in the debugging logic.
 
 #if !defined(NDEBUG)
 
 #include "base/synchronization/lock.h"
 #include "base/logging.h"
 
 namespace base {
 
-const PlatformThreadId kNoThreadId = static_cast<PlatformThreadId>(0);
-
 Lock::Lock() : lock_() {
-  owned_by_thread_ = false;
-  owning_thread_id_ = kNoThreadId;
 }
 
 Lock::~Lock() {
-  DCHECK(!owned_by_thread_);
-  DCHECK_EQ(kNoThreadId, owning_thread_id_);
+  DCHECK(owning_thread_ref_.is_null());
 }
 
 void Lock::AssertAcquired() const {
-  DCHECK(owned_by_thread_);
-  DCHECK_EQ(owning_thread_id_, PlatformThread::CurrentId());
+  DCHECK(owning_thread_ref_ == PlatformThread::CurrentRef());

[piman, 2014/05/21 00:55:24]

nit: DCHECK_EQ

[hubbe, 2014/05/21 04:27:35]

DCHECK_EQ requires the values to be printable, ThreadRefs are not.

 }
 
 void Lock::CheckHeldAndUnmark() {
-  DCHECK(owned_by_thread_);
-  DCHECK_EQ(owning_thread_id_, PlatformThread::CurrentId());
-  owned_by_thread_ = false;
-  owning_thread_id_ = kNoThreadId;
+  DCHECK(owning_thread_ref_ == PlatformThread::CurrentRef());

[piman, 2014/05/21 00:55:24]

nit: DCHECK_EQ

[hubbe, 2014/05/21 04:27:35]

See above.

+  owning_thread_ref_ = PlatformThreadRef();
 }
 
 void Lock::CheckUnheldAndMark() {
-  DCHECK(!owned_by_thread_);
-  owned_by_thread_ = true;
-  owning_thread_id_ = PlatformThread::CurrentId();
+  DCHECK(owning_thread_ref_.is_null());
+  owning_thread_ref_ = PlatformThread::CurrentRef();
 }
 
 }  // namespace base
 
 #endif  // NDEBUG