diff options
| author | Chris Peterson <cpeterson@mozilla.com> | 2012-12-30 21:48:53 -0800 |
|---|---|---|
| committer | Chris Peterson <cpeterson@mozilla.com> | 2012-12-30 23:12:24 -0800 |
| commit | e08f304b81c845f53275e34b8db26a1ac47e72d3 (patch) | |
| tree | 34a83ac7a0cc9f0df061c876d8e537bd90b241dd /src/rt/rust_sched_loop.cpp | |
| parent | 08d9c5be2f75bd034ca3e820fdad8e202b321307 (diff) | |
| download | rust-e08f304b81c845f53275e34b8db26a1ac47e72d3.tar.gz rust-e08f304b81c845f53275e34b8db26a1ac47e72d3.zip | |
rt: Remove dead code from schedule_task()
Diffstat (limited to 'src/rt/rust_sched_loop.cpp')
| -rw-r--r-- | src/rt/rust_sched_loop.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rt/rust_sched_loop.cpp b/src/rt/rust_sched_loop.cpp index f6b061a5bbc..e56ce6dd263 100644 --- a/src/rt/rust_sched_loop.cpp +++ b/src/rt/rust_sched_loop.cpp @@ -100,6 +100,7 @@ rust_sched_loop::kill_all_tasks() { size_t rust_sched_loop::number_of_live_tasks() { + lock.must_have_lock(); return running_tasks.length() + blocked_tasks.length(); } @@ -148,14 +149,10 @@ rust_sched_loop::release_task(rust_task *task) { rust_task * rust_sched_loop::schedule_task() { lock.must_have_lock(); - assert(this); if (running_tasks.length() > 0) { size_t k = isaac_rand(&rctx); - // Look around for a runnable task, starting at k. - for(size_t j = 0; j < running_tasks.length(); ++j) { - size_t i = (j + k) % running_tasks.length(); - return (rust_task *)running_tasks[i]; - } + size_t i = k % running_tasks.length(); + return (rust_task *)running_tasks[i]; } return NULL; } |
