Skip to content

Commit

Permalink
Make current-thread test use current-thread runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
Darksonn committed May 4, 2024
1 parent a855fde commit 0f6dc3a
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions tokio/src/runtime/tests/loom_current_thread/yield_now.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use crate::runtime::park;
use crate::runtime::tests::loom_oneshot as oneshot;
use crate::runtime::{self, Runtime};

#[test]
Expand All @@ -8,10 +7,9 @@ fn yield_calls_park_before_scheduling_again() {
let mut loom = loom::model::Builder::default();
loom.max_permutations = Some(1);
loom.check(|| {
let rt = mk_runtime(2);
let (tx, rx) = oneshot::channel::<()>();
let rt = mk_runtime();

rt.spawn(async {
let jh = rt.spawn(async {
let tid = loom::thread::current().id();
let park_count = park::current_thread_park_count();

Expand All @@ -21,17 +19,12 @@ fn yield_calls_park_before_scheduling_again() {
let new_park_count = park::current_thread_park_count();
assert_eq!(park_count + 1, new_park_count);
}

tx.send(());
});

rx.recv();
rt.block_on(jh).unwrap();
});
}

fn mk_runtime(num_threads: usize) -> Runtime {
runtime::Builder::new_multi_thread()
.worker_threads(num_threads)
.build()
.unwrap()
fn mk_runtime() -> Runtime {
runtime::Builder::new_current_thread().build().unwrap()
}

0 comments on commit 0f6dc3a

Please sign in to comment.