mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
Remove lock around tokio-rt handle (#36762)
It seems sub-optimal to to sequentialise execution by grabbing a lock, each time we want to spawn a task onto the tokio runtime. We don't need the lock either, so it makes sense to just remove it, which also simplifies a bunch of the using code. Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
parent
955149b194
commit
c46402e222
5 changed files with 37 additions and 44 deletions
|
@ -2,31 +2,27 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
use std::cmp::Ord;
|
||||
use std::sync::LazyLock;
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::sync::{LazyLock, Mutex};
|
||||
use std::thread;
|
||||
|
||||
use tokio::runtime::{Builder, Runtime};
|
||||
|
||||
pub static HANDLE: LazyLock<Mutex<Option<Runtime>>> = LazyLock::new(|| {
|
||||
Mutex::new(Some(
|
||||
Builder::new_multi_thread()
|
||||
.thread_name_fn(|| {
|
||||
static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
|
||||
let id = ATOMIC_ID.fetch_add(1, Ordering::Relaxed);
|
||||
format!("tokio-runtime-{}", id)
|
||||
})
|
||||
.worker_threads(
|
||||
thread::available_parallelism()
|
||||
.map(|i| i.get())
|
||||
.unwrap_or(servo_config::pref!(threadpools_fallback_worker_num) as usize)
|
||||
.min(
|
||||
servo_config::pref!(threadpools_async_runtime_workers_max).max(1) as usize,
|
||||
),
|
||||
)
|
||||
.enable_io()
|
||||
.enable_time()
|
||||
.build()
|
||||
.unwrap(),
|
||||
))
|
||||
pub static HANDLE: LazyLock<Runtime> = LazyLock::new(|| {
|
||||
Builder::new_multi_thread()
|
||||
.thread_name_fn(|| {
|
||||
static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
|
||||
let id = ATOMIC_ID.fetch_add(1, Ordering::Relaxed);
|
||||
format!("tokio-runtime-{}", id)
|
||||
})
|
||||
.worker_threads(
|
||||
thread::available_parallelism()
|
||||
.map(|i| i.get())
|
||||
.unwrap_or(servo_config::pref!(threadpools_fallback_worker_num) as usize)
|
||||
.min(servo_config::pref!(threadpools_async_runtime_workers_max).max(1) as usize),
|
||||
)
|
||||
.enable_io()
|
||||
.enable_time()
|
||||
.build()
|
||||
.expect("Unable to build tokio-runtime runtime")
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue