mirror of
https://github.com/servo/servo.git
synced 2025-09-30 00:29:14 +01:00
storage: Move shared functionality to base (#39419)
Part of #39418. See that PR for a full description. Moves: - `read_json_from_file` - `write_json_to_file` - `IpcSendResult` - `IpcSend` Renames: - `CoreResourceThreadPool` to `ThreadPool` (shorter and more descriptive, as we use it for more than the core resource thread now) Signed-off-by: Ashwin Naren <arihant2math@gmail.com>
This commit is contained in:
parent
ba208b19cc
commit
f766b66a97
25 changed files with 254 additions and 98 deletions
139
components/shared/base/threadpool.rs
Normal file
139
components/shared/base/threadpool.rs
Normal file
|
@ -0,0 +1,139 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* 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::sync::{Arc, Mutex};
|
||||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
use log::debug;
|
||||
|
||||
/// The state of the thread-pool used by CoreResource.
|
||||
struct ThreadPoolState {
|
||||
/// The number of active workers.
|
||||
active_workers: u32,
|
||||
/// Whether the pool can spawn additional work.
|
||||
active: bool,
|
||||
}
|
||||
|
||||
impl ThreadPoolState {
|
||||
pub fn new() -> ThreadPoolState {
|
||||
ThreadPoolState {
|
||||
active_workers: 0,
|
||||
active: true,
|
||||
}
|
||||
}
|
||||
|
||||
/// Is the pool still able to spawn new work?
|
||||
pub fn is_active(&self) -> bool {
|
||||
self.active
|
||||
}
|
||||
|
||||
/// How many workers are currently active?
|
||||
pub fn active_workers(&self) -> u32 {
|
||||
self.active_workers
|
||||
}
|
||||
|
||||
/// Prevent additional work from being spawned.
|
||||
pub fn switch_to_inactive(&mut self) {
|
||||
self.active = false;
|
||||
}
|
||||
|
||||
/// Add to the count of active workers.
|
||||
pub fn increment_active(&mut self) {
|
||||
self.active_workers += 1;
|
||||
}
|
||||
|
||||
/// Substract from the count of active workers.
|
||||
pub fn decrement_active(&mut self) {
|
||||
self.active_workers -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
/// Threadpool used by Fetch and file operations.
|
||||
pub struct ThreadPool {
|
||||
pool: rayon::ThreadPool,
|
||||
state: Arc<Mutex<ThreadPoolState>>,
|
||||
}
|
||||
|
||||
impl ThreadPool {
|
||||
pub fn new(num_threads: usize, pool_name: String) -> Self {
|
||||
debug!("Creating new ThreadPool with {num_threads} threads!");
|
||||
let pool = rayon::ThreadPoolBuilder::new()
|
||||
.thread_name(move |i| format!("{pool_name}#{i}"))
|
||||
.num_threads(num_threads)
|
||||
.build()
|
||||
.unwrap();
|
||||
let state = Arc::new(Mutex::new(ThreadPoolState::new()));
|
||||
Self { pool, state }
|
||||
}
|
||||
|
||||
/// Spawn work on the thread-pool, if still active.
|
||||
///
|
||||
/// There is no need to give feedback to the caller,
|
||||
/// because if we do not perform work,
|
||||
/// it is because the system as a whole is exiting.
|
||||
pub fn spawn<OP>(&self, work: OP)
|
||||
where
|
||||
OP: FnOnce() + Send + 'static,
|
||||
{
|
||||
{
|
||||
let mut state = self.state.lock().unwrap();
|
||||
if state.is_active() {
|
||||
state.increment_active();
|
||||
} else {
|
||||
// Don't spawn any work.
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
let state = self.state.clone();
|
||||
|
||||
self.pool.spawn(move || {
|
||||
{
|
||||
let mut state = state.lock().unwrap();
|
||||
if !state.is_active() {
|
||||
// Decrement number of active workers and return,
|
||||
// without doing any work.
|
||||
return state.decrement_active();
|
||||
}
|
||||
}
|
||||
// Perform work.
|
||||
work();
|
||||
{
|
||||
// Decrement number of active workers.
|
||||
let mut state = state.lock().unwrap();
|
||||
state.decrement_active();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// Prevent further work from being spawned,
|
||||
/// and wait until all workers are done,
|
||||
/// or a timeout of roughly one second has been reached.
|
||||
pub fn exit(&self) {
|
||||
{
|
||||
let mut state = self.state.lock().unwrap();
|
||||
state.switch_to_inactive();
|
||||
}
|
||||
let mut rounds = 0;
|
||||
loop {
|
||||
rounds += 1;
|
||||
{
|
||||
let state = self.state.lock().unwrap();
|
||||
let still_active = state.active_workers();
|
||||
|
||||
if still_active == 0 || rounds == 10 {
|
||||
if still_active > 0 {
|
||||
debug!(
|
||||
"Exiting ThreadPool with {:?} still working(should be zero)",
|
||||
still_active
|
||||
);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
thread::sleep(Duration::from_millis(100));
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue