Skip to content

Commit 20c1fdc

Browse files
authored
runtime: consistently use worker_threads instead of core_threads (#7186)
1 parent 638ce93 commit 20c1fdc

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

tokio/src/runtime/builder.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1640,21 +1640,21 @@ cfg_rt_multi_thread! {
16401640
use crate::runtime::{Config, runtime::Scheduler};
16411641
use crate::runtime::scheduler::{self, MultiThread};
16421642

1643-
let core_threads = self.worker_threads.unwrap_or_else(num_cpus);
1643+
let worker_threads = self.worker_threads.unwrap_or_else(num_cpus);
16441644

1645-
let (driver, driver_handle) = driver::Driver::new(self.get_cfg(core_threads))?;
1645+
let (driver, driver_handle) = driver::Driver::new(self.get_cfg(worker_threads))?;
16461646

16471647
// Create the blocking pool
16481648
let blocking_pool =
1649-
blocking::create_blocking_pool(self, self.max_blocking_threads + core_threads);
1649+
blocking::create_blocking_pool(self, self.max_blocking_threads + worker_threads);
16501650
let blocking_spawner = blocking_pool.spawner().clone();
16511651

16521652
// Generate a rng seed for this runtime.
16531653
let seed_generator_1 = self.seed_generator.next_generator();
16541654
let seed_generator_2 = self.seed_generator.next_generator();
16551655

16561656
let (scheduler, handle, launch) = MultiThread::new(
1657-
core_threads,
1657+
worker_threads,
16581658
driver,
16591659
driver_handle,
16601660
blocking_spawner,
@@ -1694,20 +1694,20 @@ cfg_rt_multi_thread! {
16941694
use crate::runtime::{Config, runtime::Scheduler};
16951695
use crate::runtime::scheduler::MultiThreadAlt;
16961696

1697-
let core_threads = self.worker_threads.unwrap_or_else(num_cpus);
1698-
let (driver, driver_handle) = driver::Driver::new(self.get_cfg(core_threads))?;
1697+
let worker_threads = self.worker_threads.unwrap_or_else(num_cpus);
1698+
let (driver, driver_handle) = driver::Driver::new(self.get_cfg(worker_threads))?;
16991699

17001700
// Create the blocking pool
17011701
let blocking_pool =
1702-
blocking::create_blocking_pool(self, self.max_blocking_threads + core_threads);
1702+
blocking::create_blocking_pool(self, self.max_blocking_threads + worker_threads);
17031703
let blocking_spawner = blocking_pool.spawner().clone();
17041704

17051705
// Generate a rng seed for this runtime.
17061706
let seed_generator_1 = self.seed_generator.next_generator();
17071707
let seed_generator_2 = self.seed_generator.next_generator();
17081708

17091709
let (scheduler, handle) = MultiThreadAlt::new(
1710-
core_threads,
1710+
worker_threads,
17111711
driver,
17121712
driver_handle,
17131713
blocking_spawner,

0 commit comments

Comments
 (0)