From 0c9a66c1f64b1706f5e31e46fffb4644bfaf1eee Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Thu, 9 Apr 2020 17:02:27 +0200
Subject: [PATCH] fix scheduler loop

This now matches more closely the logic as implemented in #631, and fixes the performance regression as far as I have observed.

Closes #746
---
 src/rt/runtime.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/rt/runtime.rs b/src/rt/runtime.rs
index 62b85f84..5a9d3025 100644
--- a/src/rt/runtime.rs
+++ b/src/rt/runtime.rs
@@ -249,6 +249,8 @@ impl Machine {
                 continue;
             }
 
+            let mut sched = rt.sched.lock().unwrap();
+
             // One final check for available tasks while the scheduler is locked.
             if let Some(task) = iter::repeat_with(|| self.find_task(rt))
                 .find(|s| !s.is_retry())
@@ -258,19 +260,19 @@ impl Machine {
                 continue;
             }
 
-            let mut sched = rt.sched.lock().unwrap();
-
+            // If another thread is already blocked on the reactor, there is no point in keeping
+            // the current thread around since there is too little work to do.
             if sched.polling {
-                thread::sleep(Duration::from_micros(10));
-                continue;
+                break;
             }
 
+            // Unlock the schedule poll the reactor until new I/O events arrive.
             sched.polling = true;
             drop(sched);
-
             rt.reactor.poll(None).unwrap();
 
-            let mut sched = rt.sched.lock().unwrap();
+            // Lock the scheduler again and re-register the machine.
+            sched = rt.sched.lock().unwrap();
             sched.polling = false;
 
             runs = 0;