gvsafronov
/
skytable
1
0
Fork 0
Code Pull Requests Activity

Use stdlib for core count and upgrade deps

Browse Source
next
Sayan Nandan 2 years ago
parent 0df1acd2be
commit 0b5b978e81
No known key found for this signature in database
GPG Key ID: 8BC07A0A4D41DD52
7 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File

33
Cargo.lock generated
Unescape Escape View File

@ -320,9 +320,9 @@ dependencies = [
[[package]]
name = "crossterm"
version = "0.23.2"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17"
checksum = "ab9f7409c70a38a56216480fba371ee460207dd8926ccf5b4160591759559170"
dependencies = [
"bitflags",
"crossterm_winapi",
@ -560,9 +560,9 @@ dependencies = [
[[package]]
name = "hashbrown"
version = "0.12.1"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022"
dependencies = [
"ahash",
]
@ -1061,9 +1061,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.5.6"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
dependencies = [
"aho-corasick",
"memchr",
@ -1072,9 +1072,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.26"
version = "0.6.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
[[package]]
name = "rustix"
@ -1137,18 +1137,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.137"
version = "1.0.138"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.137"
version = "1.0.138"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c"
dependencies = [
"proc-macro2",
"quote",
@ -1157,9 +1157,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.81"
version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
dependencies = [
"itoa",
"ryu",
@ -1356,7 +1356,6 @@ dependencies = [
"env_logger",
"libstress",
"log",
"num_cpus",
"rand",
"skytable 0.8.0 (git+https://github.com/skytable/client-rust?branch=next)",
"sysinfo",
@ -1387,9 +1386,9 @@ dependencies = [
[[package]]
name = "sysinfo"
version = "0.24.5"
version = "0.24.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d80929a3b477bce3a64360ca82bfb361eacce1dcb7b1fb31e8e5e181e37c212"
checksum = "0b6e19da72a8d75be4d40e4dd4686afca31507f26c3ffdf6bd3073278d9de0a0"
dependencies = [
"cfg-if",
"core-foundation-sys",

2
cli/Cargo.toml
Unescape Escape View File

@ -17,5 +17,5 @@ skytable = { git = "https://github.com/skytable/client-rust", branch = "next", f
tokio = { version = "1.19.2", features = ["full"] }
clap = { version = "2", features = ["yaml"] }
rustyline = "9.1.2"
crossterm = "0.23.2"
crossterm = "0.24.0"
lazy_static = "1.4.0"

8
harness/Cargo.toml
Unescape Escape View File

@ -6,12 +6,14 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
# internal deps
skytable = { git = "https://github.com/skytable/client-rust.git", features = [
"sync",
], default-features = false }
libsky = { path = "../libsky" }
# external deps
env_logger = "0.9.0"
log = "0.4.17"
zip = { version = "0.6.2", features = ["deflate"] }
powershell_script = "1.0.2"
openssl = { version = "0.10.40", features = ["vendored"] }
skytable = { git = "https://github.com/skytable/client-rust.git", features = [
"sync",
], default-features = false }

6
server/Cargo.toml
Unescape Escape View File

@ -15,12 +15,12 @@ bytes = "1.1.0"
chrono = "0.4.19"
clap = { version = "2", features = ["yaml"] }
env_logger = "0.9.0"
hashbrown = { version = "0.12.1", features = ["raw"] }
hashbrown = { version = "0.12.2", features = ["raw"] }
log = "0.4.17"
openssl = { version = "0.10.40", features = ["vendored"] }
parking_lot = "0.12.1"
regex = "1.5.6"
serde = { version = "1.0.137", features = ["derive"] }
regex = "1.6.0"
serde = { version = "1.0.138", features = ["derive"] }
tokio = { version = "1.19.2", features = ["full"] }
tokio-openssl = "0.6.3"
toml = "0.5.9"

6
sky-bench/Cargo.toml
Unescape Escape View File

@ -12,9 +12,9 @@ libstress = { path = "../libstress" }
skytable = { git = "https://github.com/skytable/client-rust", branch = "next", features = [
"dbg",
] }
devtimer = "4.0.1"
# external deps
clap = { version = "2", features = ["yaml"] }
devtimer = "4.0.1"
rand = "0.8.5"
serde = { version = "1.0.137", features = ["derive"] }
serde_json = "1.0.81"
serde = { version = "1.0.138", features = ["derive"] }
serde_json = "1.0.82"

3
stress-test/Cargo.toml
Unescape Escape View File

@ -14,9 +14,8 @@ skytable = { git = "https://github.com/skytable/client-rust.git", branch = "next
] }
devtimer = "4.0.1"
# external deps
sysinfo = "0.24.5"
sysinfo = "0.24.6"
env_logger = "0.9.0"
log = "0.4.17"
rand = "0.8.5"
crossbeam-channel = "0.5.5"
num_cpus = "1.13.1"

4
stress-test/src/main.rs
Unescape Escape View File

@ -27,6 +27,8 @@
#![deny(unused_crate_dependencies)]
#![deny(unused_imports)]
use std::thread::available_parallelism;
use {
libstress::traits::ExitError,
log::{info, trace, warn},
@ -61,7 +63,7 @@ fn main() {
let to_refresh = RefreshKind::new().with_memory();
let mut sys = System::new_with_specifics(to_refresh);
sys.refresh_specifics(to_refresh);
let core_count = num_cpus::get();
let core_count = available_parallelism().map_or(1, usize::from);
let max_workers = core_count * 2;
trace!(
"This host has {} logical cores. Will spawn a maximum of {} threads",

Write Preview
Loading…
Cancel
Save