diff options
author | rdsmith@google.com <rdsmith@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-13 12:45:33 +0000 |
---|---|---|
committer | rdsmith@google.com <rdsmith@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-13 12:45:33 +0000 |
commit | b36f2e4174e9cd104d33c027042db0028e55500a (patch) | |
tree | 27a8d86d25af2f3f49e29480f287023828053808 /base/lock.cc | |
parent | 1dd0f46d242ac273cd7ff138b9311384c60c1464 (diff) | |
download | chromium_src-b36f2e4174e9cd104d33c027042db0028e55500a.zip chromium_src-b36f2e4174e9cd104d33c027042db0028e55500a.tar.gz chromium_src-b36f2e4174e9cd104d33c027042db0028e55500a.tar.bz2 |
Revert 49648 - Initial implementation of new AssertAcquired() functionality for Posix.
Webkit compile failing.
BUG=44091
TEST=Try bot run on Windows, Linux, Mac. Will land during low traffic time and revert on any problems or perf degradation.
Review URL: http://codereview.chromium.org/2196001
TBR=rdsmith@google.com
Review URL: http://codereview.chromium.org/2805001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/lock.cc')
-rw-r--r-- | base/lock.cc | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/base/lock.cc b/base/lock.cc index c73a458..9ff963b 100644 --- a/base/lock.cc +++ b/base/lock.cc @@ -1,37 +1,7 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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. +// Lock class. -#if !defined(NDEBUG) - -#include "base/lock.h" -#include "base/logging.h" - -Lock::Lock() : lock_() { - owned_by_thread_ = false; - owning_thread_id_ = static_cast<PlatformThreadId>(0); -} - -void Lock::AssertAcquired() const { - DCHECK(owned_by_thread_); - DCHECK_EQ(owning_thread_id_, PlatformThread::CurrentId()); -} - -void Lock::CheckHeldAndUnmark() { - DCHECK(owned_by_thread_); - DCHECK_EQ(owning_thread_id_, PlatformThread::CurrentId()); - owned_by_thread_ = false; - owning_thread_id_ = static_cast<PlatformThreadId>(0); -} - -void Lock::CheckUnheldAndMark() { - DCHECK(!owned_by_thread_); - owned_by_thread_ = true; - owning_thread_id_ = PlatformThread::CurrentId(); -} - -#endif // NDEBUG +// Depricated file. See lock_impl_*.cc for platform specific versions. |