use tokio-uring release version

This commit is contained in:
fakeshadow 2021-07-20 09:50:14 +08:00
parent 3dafa01453
commit fc3664b623
4 changed files with 9 additions and 7 deletions

View File

@ -28,7 +28,9 @@ actix-macros = { version = "0.2.0", optional = true }
futures-core = { version = "0.3", default-features = false }
tokio = { version = "1.3", features = ["rt", "net", "parking_lot", "signal", "sync", "time"] }
tokio-uring = { git = "https://github.com/tokio-rs/tokio-uring.git", optional = true }
[target."cfg(target_os = \"linux\")".dependencies]
tokio-uring = { version = "0.1", optional = true }
[dev-dependencies]
tokio = { version = "1.2", features = ["full"] }

View File

@ -91,7 +91,7 @@ pub struct Arbiter {
}
impl Arbiter {
#[cfg(not(feature = "io-uring"))]
#[cfg(any(not(target_os = "linux"), not(feature = "io-uring")))]
/// Spawn a new Arbiter thread and start its event loop.
///
/// # Panics
@ -104,7 +104,7 @@ impl Arbiter {
})
}
#[cfg(not(feature = "io-uring"))]
#[cfg(any(not(target_os = "linux"), not(feature = "io-uring")))]
/// Spawn a new Arbiter using the [Tokio Runtime](tokio-runtime) returned from a closure.
///
/// [tokio-runtime]: tokio::runtime::Runtime
@ -159,7 +159,7 @@ impl Arbiter {
Arbiter { tx, thread_handle }
}
#[cfg(feature = "io-uring")]
#[cfg(all(target_os = "linux", feature = "io-uring"))]
/// Spawn a new Arbiter thread and start its event loop with `tokio-uring` runtime.
///
/// # Panics

View File

@ -302,7 +302,7 @@ fn try_current_with_system() {
System::new().block_on(async { assert!(System::try_current().is_some()) });
}
#[cfg(feature = "io-uring")]
#[cfg(all(target_os = "linux", feature = "io-uring"))]
#[test]
fn tokio_uring_arbiter() {
let system = System::new();

View File

@ -280,7 +280,7 @@ impl ServerWorker {
let counter_clone = counter.clone();
// every worker runs in it's own arbiter.
// use a custom tokio runtime builder to change the settings of runtime.
#[cfg(feature = "io-uring")]
#[cfg(all(target_os = "linux", feature = "io-uring"))]
let arbiter = {
// TODO: pass max blocking thread config when tokio-uring enable configuration
// on building runtime.
@ -288,7 +288,7 @@ impl ServerWorker {
Arbiter::new()
};
#[cfg(not(feature = "io-uring"))]
#[cfg(any(not(target_os = "linux"), not(feature = "io-uring")))]
let arbiter = Arbiter::with_tokio_rt(move || {
tokio::runtime::Builder::new_current_thread()
.enable_all()