Skip to content

Commit 84a37a3

Browse files
committed
Merge pull request #4323 from cpeterso/cpeterso-schedule-task
rt: Remove dead code from schedule_task()
2 parents 08d9c5b + e08f304 commit 84a37a3

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/rt/rust_sched_loop.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ rust_sched_loop::kill_all_tasks() {
100100

101101
size_t
102102
rust_sched_loop::number_of_live_tasks() {
103+
lock.must_have_lock();
103104
return running_tasks.length() + blocked_tasks.length();
104105
}
105106

@@ -148,14 +149,10 @@ rust_sched_loop::release_task(rust_task *task) {
148149
rust_task *
149150
rust_sched_loop::schedule_task() {
150151
lock.must_have_lock();
151-
assert(this);
152152
if (running_tasks.length() > 0) {
153153
size_t k = isaac_rand(&rctx);
154-
// Look around for a runnable task, starting at k.
155-
for(size_t j = 0; j < running_tasks.length(); ++j) {
156-
size_t i = (j + k) % running_tasks.length();
157-
return (rust_task *)running_tasks[i];
158-
}
154+
size_t i = k % running_tasks.length();
155+
return (rust_task *)running_tasks[i];
159156
}
160157
return NULL;
161158
}

0 commit comments

Comments
 (0)