From 26c11f7b503c43961b609321c9e4790931240998 Mon Sep 17 00:00:00 2001 From: Eric Holk Date: Fri, 22 Jun 2012 13:07:07 -0700 Subject: Use must_have_lock instead of private functions. (Issue #2700) I hereby declare that messages sent from the same source arrive in order (Issue #2605) Removing FIXME, owned is the correct type here. (Issue #2704) Remove outdated FIXME (Issue #2703) Updating test for spawning native functions (Issue #2602) Removing bogus FIXME (Issue #2599) --- src/rt/rust_builtin.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/rt/rust_builtin.cpp') diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index cab1b6b427c..ad729494c45 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -891,9 +891,7 @@ rust_unlock_cond_lock(rust_cond_lock *lock) { extern "C" void rust_wait_cond_lock(rust_cond_lock *lock) { rust_task *task = rust_get_current_task(); -#ifdef DEBUG_LOCKS - assert(lock->lock.lock_held_by_current_thread()); -#endif + lock->lock.must_have_lock(); assert(NULL == lock->waiting); lock->waiting = task; task->block(lock, "waiting for signal"); @@ -905,9 +903,7 @@ rust_wait_cond_lock(rust_cond_lock *lock) { extern "C" bool rust_signal_cond_lock(rust_cond_lock *lock) { -#ifdef DEBUG_LOCKS - assert(lock->lock.lock_held_by_current_thread()); -#endif + lock->lock.must_have_lock(); if(NULL == lock->waiting) { return false; } -- cgit 1.4.1-3-g733a5