tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-09 00:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

rt: Remove threaded_scheduler() and basic_scheduler() (#2876)

Browse Source 
Co-authored-by: Alice Ryhl <[email protected]>
Co-authored-by: Carl Lerche <[email protected]>
This commit is contained in:
Lucio Franco
2020-10-12 13:44:54 -04:00
committed by GitHub
co-authored by Alice Ryhl Carl Lerche
parent 0893841f31
commit 8880222036
90 changed files with 1480 additions and 1698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio/tests/task_blocking.rs
+15 -38
View File
@@ -28,7 +28,7 @@ async fn basic_blocking() {
}
}
#[tokio::test(threaded_scheduler)]
#[tokio::test(flavor = "multi_thread")]
async fn block_in_blocking() {
// Run a few times
for _ in 0..100 {
@@ -51,7 +51,7 @@ async fn block_in_blocking() {
}
}
#[tokio::test(threaded_scheduler)]
#[tokio::test(flavor = "multi_thread")]
async fn block_in_block() {
// Run a few times
for _ in 0..100 {
@@ -71,7 +71,7 @@ async fn block_in_block() {
}
}
#[tokio::test(basic_scheduler)]
#[tokio::test(flavor = "current_thread")]
#[should_panic]
async fn no_block_in_basic_scheduler() {
task::block_in_place(|| {});
@@ -79,10 +79,7 @@ async fn no_block_in_basic_scheduler() {
#[test]
fn yes_block_in_threaded_block_on() {
let rt = runtime::Builder::new()
.threaded_scheduler()
.build()
.unwrap();
let rt = runtime::Runtime::new().unwrap();
rt.block_on(async {
task::block_in_place(|| {});
});
@@ -91,7 +88,7 @@ fn yes_block_in_threaded_block_on() {
#[test]
#[should_panic]
fn no_block_in_basic_block_on() {
let rt = runtime::Builder::new().basic_scheduler().build().unwrap();
let rt = runtime::Builder::new_current_thread().build().unwrap();
rt.block_on(async {
task::block_in_place(|| {});
});
@@ -99,15 +96,11 @@ fn no_block_in_basic_block_on() {
#[test]
fn can_enter_basic_rt_from_within_block_in_place() {
let outer = tokio::runtime::Builder::new()
.threaded_scheduler()
.build()
.unwrap();
let outer = tokio::runtime::Runtime::new().unwrap();
outer.block_on(async {
tokio::task::block_in_place(|| {
let inner = tokio::runtime::Builder::new()
.basic_scheduler()
let inner = tokio::runtime::Builder::new_current_thread()
.build()
.unwrap();
@@ -120,15 +113,11 @@ fn can_enter_basic_rt_from_within_block_in_place() {
fn useful_panic_message_when_dropping_rt_in_rt() {
use std::panic::{catch_unwind, AssertUnwindSafe};
let outer = tokio::runtime::Builder::new()
.threaded_scheduler()
.build()
.unwrap();
let outer = tokio::runtime::Runtime::new().unwrap();
let result = catch_unwind(AssertUnwindSafe(|| {
outer.block_on(async {
let _ = tokio::runtime::Builder::new()
.basic_scheduler()
let _ = tokio::runtime::Builder::new_current_thread()
.build()
.unwrap();
});
@@ -147,14 +136,10 @@ fn useful_panic_message_when_dropping_rt_in_rt() {
#[test]
fn can_shutdown_with_zero_timeout_in_runtime() {
let outer = tokio::runtime::Builder::new()
.threaded_scheduler()
.build()
.unwrap();
let outer = tokio::runtime::Runtime::new().unwrap();
outer.block_on(async {
let rt = tokio::runtime::Builder::new()
.basic_scheduler()
let rt = tokio::runtime::Builder::new_current_thread()
.build()
.unwrap();
rt.shutdown_timeout(Duration::from_nanos(0));
@@ -163,14 +148,10 @@ fn can_shutdown_with_zero_timeout_in_runtime() {
#[test]
fn can_shutdown_now_in_runtime() {
let outer = tokio::runtime::Builder::new()
.threaded_scheduler()
.build()
.unwrap();
let outer = tokio::runtime::Runtime::new().unwrap();
outer.block_on(async {
let rt = tokio::runtime::Builder::new()
.basic_scheduler()
let rt = tokio::runtime::Builder::new_current_thread()
.build()
.unwrap();
rt.shutdown_background();
@@ -179,8 +160,7 @@ fn can_shutdown_now_in_runtime() {
#[test]
fn coop_disabled_in_block_in_place() {
let outer = tokio::runtime::Builder::new()
.threaded_scheduler()
let outer = tokio::runtime::Builder::new_multi_thread()
.enable_time()
.build()
.unwrap();
@@ -213,10 +193,7 @@ fn coop_disabled_in_block_in_place_in_block_on() {
let (done_tx, done_rx) = std::sync::mpsc::channel();
let done = done_tx.clone();
thread::spawn(move || {
let outer = tokio::runtime::Builder::new()
.threaded_scheduler()
.build()
.unwrap();
let outer = tokio::runtime::Runtime::new().unwrap();
let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
for i in 0..200 {