about summary refs log tree commit diff
path: root/src/rt/rust_sched_loop.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-03-30 18:37:30 -0700
committerBrian Anderson <banderson@mozilla.com>2012-03-31 19:51:29 -0700
commitc8dc6fcb4cd29e5fb6c509149871b869b951295d (patch)
tree3556f9f57afa10a2f14c4ff44042b6db174ded2a /src/rt/rust_sched_loop.cpp
parent609144f7a6adba552602feb7e50e7c4d6a815fae (diff)
downloadrust-c8dc6fcb4cd29e5fb6c509149871b869b951295d.tar.gz
rust-c8dc6fcb4cd29e5fb6c509149871b869b951295d.zip
Revert "rt: Remove lock_held_by_current_thread"
Adds back the ability to make assertions about locks, but only under the
--enable-debug configuration

This reverts commit b247de64583e2ab527088813ba9192824554e801.

Conflicts:

	src/rt/rust_sched_loop.cpp
Diffstat (limited to 'src/rt/rust_sched_loop.cpp')
-rw-r--r--src/rt/rust_sched_loop.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rt/rust_sched_loop.cpp b/src/rt/rust_sched_loop.cpp
index ce549db5236..d494fa487cf 100644
--- a/src/rt/rust_sched_loop.cpp
+++ b/src/rt/rust_sched_loop.cpp
@@ -108,6 +108,8 @@ rust_sched_loop::number_of_live_tasks() {
  */
 void
 rust_sched_loop::reap_dead_tasks() {
+    lock.must_have_lock();
+
     if (dead_task == NULL) {
         return;
     }