preemption: block_on future also cedes

tokio-rs · Jan 23, 2020 · 8fafbc6 · 8fafbc6
1 parent 98ce984
commit 8fafbc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/tokio/src/runtime/basic_scheduler.rs b/tokio/src/runtime/basic_scheduler.rs
@@ -139,6 +139,8 @@ where
                 return v;
             }
 
+            crate::league::ceded();
+
             scheduler.tick(local);
 
             // Maintenance work

diff --git a/tokio/src/runtime/enter.rs b/tokio/src/runtime/enter.rs
@@ -102,6 +102,8 @@ cfg_blocking_impl! {
                     return Ok(v);
                 }
 
+                crate::league::ceded();
+
                 park.park()?;
             }
         }

diff --git a/tokio/src/runtime/shell.rs b/tokio/src/runtime/shell.rs
@@ -50,6 +50,8 @@ impl Shell {
                 return v;
             }
 
+            crate::league::ceded();
+
             self.driver.park().unwrap();
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,6 +102,8 @@ cfg_blocking_impl! { @@
                         return Ok(v);
                     }
+                    crate::league::ceded();
                     park.park()?;
                 }
             }
@@ Expand Down @@