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/condition_variable_posix.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/condition_variable_posix.cc')
| -rw-r--r-- | base/condition_variable_posix.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/base/condition_variable_posix.cc b/base/condition_variable_posix.cc index 9d08f18..8c5a5c2 100644 --- a/base/condition_variable_posix.cc +++ b/base/condition_variable_posix.cc @@ -16,7 +16,7 @@ using base::Time; using base::TimeDelta; ConditionVariable::ConditionVariable(Lock* user_lock) - : user_mutex_(user_lock->lock_.os_lock()), user_lock_(user_lock) { + : user_mutex_(user_lock->lock_impl()->os_lock()) { int rv = pthread_cond_init(&condition_, NULL); DCHECK(rv == 0); } @@ -27,14 +27,8 @@ ConditionVariable::~ConditionVariable() { } void ConditionVariable::Wait() { -#if !defined(NDEBUG) - user_lock_->CheckHeldAndUnmark(); -#endif int rv = pthread_cond_wait(&condition_, user_mutex_); DCHECK(rv == 0); -#if !defined(NDEBUG) - user_lock_->CheckUnheldAndMark(); -#endif } void ConditionVariable::TimedWait(const TimeDelta& max_time) { @@ -52,14 +46,8 @@ void ConditionVariable::TimedWait(const TimeDelta& max_time) { abstime.tv_nsec %= Time::kNanosecondsPerSecond; DCHECK(abstime.tv_sec >= now.tv_sec); // Overflow paranoia -#if !defined(NDEBUG) - user_lock_->CheckHeldAndUnmark(); -#endif int rv = pthread_cond_timedwait(&condition_, user_mutex_, &abstime); DCHECK(rv == 0 || rv == ETIMEDOUT); -#if !defined(NDEBUG) - user_lock_->CheckUnheldAndMark(); -#endif } void ConditionVariable::Broadcast() { |