-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use tokio instead of async-std. (#155)
* Use tokio instead of async-std. Signed-off-by: ChenYing Kuo <[email protected]> * Reuse the current runtime if possible. Signed-off-by: ChenYing Kuo <[email protected]> --------- Signed-off-by: ChenYing Kuo <[email protected]>
- Loading branch information
Showing
3 changed files
with
33 additions
and
5 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,11 +12,13 @@ | |
// ZettaScale Zenoh Team, <[email protected]> | ||
// | ||
|
||
use std::{borrow::Cow, collections::HashMap, path::PathBuf, time::Duration}; | ||
use std::{ | ||
borrow::Cow, collections::HashMap, future::Future, path::PathBuf, sync::Arc, time::Duration, | ||
}; | ||
|
||
use async_std::sync::{Arc, Mutex}; | ||
use async_trait::async_trait; | ||
use rocksdb::{ColumnFamilyDescriptor, Options, WriteBatch, DB}; | ||
use tokio::sync::Mutex; | ||
use tracing::{debug, error, trace, warn}; | ||
use uhlc::NTP64; | ||
use zenoh::{ | ||
|
@@ -33,6 +35,32 @@ use zenoh_backend_traits::{ | |
}; | ||
use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin}; | ||
|
||
const WORKER_THREAD_NUM: usize = 2; | ||
const MAX_BLOCK_THREAD_NUM: usize = 50; | ||
lazy_static::lazy_static! { | ||
// The global runtime is used in the dynamic plugins, which we can't get the current runtime | ||
static ref TOKIO_RUNTIME: tokio::runtime::Runtime = tokio::runtime::Builder::new_multi_thread() | ||
.worker_threads(WORKER_THREAD_NUM) | ||
.max_blocking_threads(MAX_BLOCK_THREAD_NUM) | ||
.enable_all() | ||
.build() | ||
.expect("Unable to create runtime"); | ||
} | ||
#[inline(always)] | ||
fn blockon_runtime<F: Future>(task: F) -> F::Output { | ||
// Check whether able to get the current runtime | ||
match tokio::runtime::Handle::try_current() { | ||
Ok(rt) => { | ||
// Able to get the current runtime (standalone binary), spawn on the current runtime | ||
tokio::task::block_in_place(|| rt.block_on(task)) | ||
} | ||
Err(_) => { | ||
// Unable to get the current runtime (dynamic plugins), spawn on the global runtime | ||
tokio::task::block_in_place(|| TOKIO_RUNTIME.block_on(task)) | ||
} | ||
} | ||
} | ||
|
||
/// The environement variable used to configure the root of all storages managed by this RocksdbBackend. | ||
pub const SCOPE_ENV_VAR: &str = "ZENOH_BACKEND_ROCKSDB_ROOT"; | ||
|
||
|
@@ -325,7 +353,7 @@ impl Storage for RocksdbStorage { | |
|
||
impl Drop for RocksdbStorage { | ||
fn drop(&mut self) { | ||
async_std::task::block_on(async move { | ||
blockon_runtime(async move { | ||
// Get lock on DB and take DB so we can drop it before destroying it | ||
// (avoiding RocksDB lock to be taken twice) | ||
let mut db_cell = self.db.lock().await; | ||
|