From d600ab9a8f37e9eff3fa8587069a816b65b6da0b Mon Sep 17 00:00:00 2001 From: Lucio Franco Date: Thu, 27 Aug 2020 20:05:48 -0400 Subject: rt: Refactor `Runtime::block_on` to take `&self` (#2782) Co-authored-by: Eliza Weisman --- benches/mpsc.rs | 10 +++++----- benches/scheduler.rs | 6 +++--- benches/spawn.rs | 12 ++++++------ benches/sync_rwlock.rs | 10 +++++----- benches/sync_semaphore.rs | 10 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'benches') diff --git a/benches/mpsc.rs b/benches/mpsc.rs index 49bd3cc0..ec07ad8f 100644 --- a/benches/mpsc.rs +++ b/benches/mpsc.rs @@ -43,7 +43,7 @@ fn send_large(b: &mut Bencher) { } fn contention_bounded(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -70,7 +70,7 @@ fn contention_bounded(b: &mut Bencher) { } fn contention_bounded_full(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -97,7 +97,7 @@ fn contention_bounded_full(b: &mut Bencher) { } fn contention_unbounded(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -124,7 +124,7 @@ fn contention_unbounded(b: &mut Bencher) { } fn uncontented_bounded(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -146,7 +146,7 @@ fn uncontented_bounded(b: &mut Bencher) { } fn uncontented_unbounded(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() diff --git a/benches/scheduler.rs b/benches/scheduler.rs index 0562a120..801de72a 100644 --- a/benches/scheduler.rs +++ b/benches/scheduler.rs @@ -13,7 +13,7 @@ use std::sync::{mpsc, Arc}; fn spawn_many(b: &mut Bencher) { const NUM_SPAWN: usize = 10_000; - let mut rt = rt(); + let rt = rt(); let (tx, rx) = mpsc::sync_channel(1000); let rem = Arc::new(AtomicUsize::new(0)); @@ -68,7 +68,7 @@ fn yield_many(b: &mut Bencher) { fn ping_pong(b: &mut Bencher) { const NUM_PINGS: usize = 1_000; - let mut rt = rt(); + let rt = rt(); let (done_tx, done_rx) = mpsc::sync_channel(1000); let rem = Arc::new(AtomicUsize::new(0)); @@ -111,7 +111,7 @@ fn ping_pong(b: &mut Bencher) { fn chained_spawn(b: &mut Bencher) { const ITER: usize = 1_000; - let mut rt = rt(); + let rt = rt(); fn iter(done_tx: mpsc::SyncSender<()>, n: usize) { if n == 0 { diff --git a/benches/spawn.rs b/benches/spawn.rs index 9122c7b1..f76daf3f 100644 --- a/benches/spawn.rs +++ b/benches/spawn.rs @@ -10,7 +10,7 @@ async fn work() -> usize { } fn basic_scheduler_local_spawn(bench: &mut Bencher) { - let mut runtime = tokio::runtime::Builder::new() + let runtime = tokio::runtime::Builder::new() .basic_scheduler() .build() .unwrap(); @@ -23,7 +23,7 @@ fn basic_scheduler_local_spawn(bench: &mut Bencher) { } fn threaded_scheduler_local_spawn(bench: &mut Bencher) { - let mut runtime = tokio::runtime::Builder::new() + let runtime = tokio::runtime::Builder::new() .threaded_scheduler() .build() .unwrap(); @@ -40,9 +40,9 @@ fn basic_scheduler_remote_spawn(bench: &mut Bencher) { .basic_scheduler() .build() .unwrap(); - let handle = runtime.handle(); + bench.iter(|| { - let h = handle.spawn(work()); + let h = runtime.spawn(work()); black_box(h); }); } @@ -52,9 +52,9 @@ fn threaded_scheduler_remote_spawn(bench: &mut Bencher) { .threaded_scheduler() .build() .unwrap(); - let handle = runtime.handle(); + bench.iter(|| { - let h = handle.spawn(work()); + let h = runtime.spawn(work()); black_box(h); }); } diff --git a/benches/sync_rwlock.rs b/benches/sync_rwlock.rs index 4eca9807..30c66e49 100644 --- a/benches/sync_rwlock.rs +++ b/benches/sync_rwlock.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use tokio::{sync::RwLock, task}; fn read_uncontended(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -22,7 +22,7 @@ fn read_uncontended(b: &mut Bencher) { } fn read_concurrent_uncontended_multi(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -51,7 +51,7 @@ fn read_concurrent_uncontended_multi(b: &mut Bencher) { } fn read_concurrent_uncontended(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .basic_scheduler() .build() .unwrap(); @@ -78,7 +78,7 @@ fn read_concurrent_uncontended(b: &mut Bencher) { } fn read_concurrent_contended_multi(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -108,7 +108,7 @@ fn read_concurrent_contended_multi(b: &mut Bencher) { } fn read_concurrent_contended(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .basic_scheduler() .build() .unwrap(); diff --git a/benches/sync_semaphore.rs b/benches/sync_semaphore.rs index c43311c0..32d4aa2b 100644 --- a/benches/sync_semaphore.rs +++ b/benches/sync_semaphore.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use tokio::{sync::Semaphore, task}; fn uncontended(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -27,7 +27,7 @@ async fn task(s: Arc) { } fn uncontended_concurrent_multi(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -51,7 +51,7 @@ fn uncontended_concurrent_multi(b: &mut Bencher) { } fn uncontended_concurrent_single(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .basic_scheduler() .build() .unwrap(); @@ -73,7 +73,7 @@ fn uncontended_concurrent_single(b: &mut Bencher) { } fn contended_concurrent_multi(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .core_threads(6) .threaded_scheduler() .build() @@ -97,7 +97,7 @@ fn contended_concurrent_multi(b: &mut Bencher) { } fn contended_concurrent_single(b: &mut Bencher) { - let mut rt = tokio::runtime::Builder::new() + let rt = tokio::runtime::Builder::new() .basic_scheduler() .build() .unwrap(); -- cgit v1.2.3