---

yaml
---
r: 13999
b: refs/heads/try
c: b1a090c
h: refs/heads/master
i:
  13997: eb618d7
  13995: cb7fd90
  13991: ee39245
  13983: c485367
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 6c632c71c6f86752fb626501d5368070e3e37385
+refs/heads/try: b1a090c7c4393781a92814431a5d32ffed4e57aa
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_scheduler.cpp

@@ -112,7 +112,7 @@ rust_scheduler::number_of_live_tasks() {
  * Delete any dead tasks.
  */
 void
-rust_scheduler::reap_dead_tasks(int id) {
+rust_scheduler::reap_dead_tasks() {
     I(this, lock.lock_held_by_current_thread());
     if (dead_tasks.length() == 0) {
         return;
@@ -157,7 +157,7 @@ rust_scheduler::reap_dead_tasks(int id) {
  * Returns NULL if no tasks can be scheduled.
  */
 rust_task *
-rust_scheduler::schedule_task(int id) {
+rust_scheduler::schedule_task() {
     I(this, this);
     // FIXME: in the face of failing tasks, this is not always right.
     // I(this, n_live_tasks() > 0);
@@ -222,15 +222,15 @@ rust_scheduler::start_main_loop() {
         DLOG(this, dom, "worker %d, number_of_live_tasks = %d, total = %d",
              id, number_of_live_tasks(), kernel->live_tasks);
 
-        rust_task *scheduled_task = schedule_task(id);
+        rust_task *scheduled_task = schedule_task();
 
         if (scheduled_task == NULL) {
             log_state();
             DLOG(this, task,
                  "all tasks are blocked, scheduler id %d yielding ...",
                  id);
             lock.timed_wait(10);
-            reap_dead_tasks(id);
+            reap_dead_tasks();
             DLOG(this, task,
                  "scheduler %d resuming ...", id);
             continue;
@@ -263,7 +263,7 @@ rust_scheduler::start_main_loop() {
              scheduled_task->user.rust_sp,
              id);
 
-        reap_dead_tasks(id);
+        reap_dead_tasks();
     }
 
     A(this, newborn_tasks.is_empty(), "Should have no newborn tasks");

branches/try/src/rt/rust_scheduler.h

@@ -102,8 +102,8 @@ struct rust_scheduler : public kernel_owned<rust_scheduler>,
     rust_crate_cache *get_cache();
     size_t number_of_live_tasks();
 
-    void reap_dead_tasks(int id);
-    rust_task *schedule_task(int id);
+    void reap_dead_tasks();
+    rust_task *schedule_task();
 
     void start_main_loop();