Merge branch 'master' into macos

equalitie · May 29, 2024 · bdd2779 · bdd2779
2 parents e6cb6c3 + c5b4053
commit bdd2779
Show file tree

Hide file tree

Showing 25 changed files with 1,228 additions and 309 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,18 +20,19 @@ members = [
     "utils/protocol-analyzer",
     "vfs",
     "utils/repogen"
-]
+, "utils/benchtool"]
 resolver = "2"
 
 [workspace.package]
-version = "0.8.2"
+version = "0.8.3"
 authors = ["Adam Cigánek <adam@equalit.ie>", "Peter Jankuliak <peter@equalit.ie>"]
 repository = "https://github.com/equalitie/ouisync"
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.77.1"
 
 [workspace.dependencies]
+anyhow = "1.0.86"
 assert_matches = "1.5"
 async-trait = "0.1.73"
 btdht = { git = "https://github.com/equalitie/btdht.git", rev = "e7ddf5607b20f0b82cbc3ea6259425c00bd8d16b" }
@@ -51,6 +52,7 @@ rustls = { version = "0.21.0", default-features = false }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_bytes = "0.11.8"
 serde_json = "1.0.94"
+tempfile = "3.2"
 thiserror = "1.0.49"
 tokio = { version = "1.37.0", default-features = false }
 tokio-rustls = "0.24.1"

diff --git a/bridge/Cargo.toml b/bridge/Cargo.toml
@@ -45,4 +45,4 @@ paranoid-android = "0.2.1"
 [dev-dependencies]
 assert_matches = { workspace = true }
 rcgen = { workspace = true }
-tempfile = "3.2"
+tempfile = { workspace = true }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -49,7 +49,7 @@ backoff = "0.4.0"
 hex = "0.4.3"
 once_cell = { workspace = true }
 rcgen = { workspace = true, features = ["pem"] }
-tempfile = "3.2"
+tempfile = { workspace = true }
 
 [target.'cfg(any(target_os = "linux", target_os = "osx"))'.dev-dependencies]
 libc = "0.2.126"
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -10,15 +10,15 @@ rust-version.workspace = true
 version.workspace = true
 
 [[bench]]
-name = "bench_lib"
+name = "basic"
 harness = false
 
 [[bench]]
-name = "bench_large_file"
+name = "large_file"
 harness = false
 
 [[bench]]
-name = "bench_swarm"
+name = "swarm"
 harness = false
 
 [dependencies]
@@ -93,15 +93,15 @@ network-interface = "0.1.3"
 assert_matches = { workspace = true }
 clap = { workspace = true }
 criterion = { version = "0.4", features = ["html_reports"] }
+hdrhistogram = { version = "7.5.4", default-features = false, features = ["sync"] }
 metrics_ext = { path = "../metrics_ext" }
 ouisync-tracing-fmt = { path = "../tracing_fmt" }
-parse-size = "1.0"
 proptest = "1.0"
 rmp-serde = { workspace = true }
 serde_json = { workspace = true }
 serde_test = "1.0.176"
 similar-asserts = "1.5.0"
-tempfile = "3.2"
+tempfile = { workspace = true }
 test-strategy = "0.2.1"
 tokio = { workspace = true, features = ["process", "test-util"] }
 

diff --git a/lib/benches/bench_lib.rs → lib/benches/basic.rs b/lib/benches/bench_lib.rs → lib/benches/basic.rs
@@ -14,7 +14,7 @@ criterion_main!(default);
 fn write_file(c: &mut Criterion) {
     let runtime = Runtime::new().unwrap();
 
-    let mut group = c.benchmark_group("lib/write_file");
+    let mut group = c.benchmark_group("write_file");
     group.sample_size(10);
 
     let buffer_size = 4096;
@@ -56,7 +56,7 @@ fn write_file(c: &mut Criterion) {
 fn read_file(c: &mut Criterion) {
     let runtime = Runtime::new().unwrap();
 
-    let mut group = c.benchmark_group("lib/read_file");
+    let mut group = c.benchmark_group("read_file");
     group.sample_size(10);
 
     let buffer_size = 4096;
@@ -109,7 +109,7 @@ fn read_file(c: &mut Criterion) {
 fn sync(c: &mut Criterion) {
     let runtime = Runtime::new().unwrap();
 
-    let mut group = c.benchmark_group("lib/sync");
+    let mut group = c.benchmark_group("sync");
     group.sample_size(10);
 
     for m in [1, 8] {

diff --git a/lib/benches/bench_swarm.rs b/lib/benches/bench_swarm.rs
diff --git a/lib/benches/bench_large_file.rs → lib/benches/large_file.rs b/lib/benches/bench_large_file.rs → lib/benches/large_file.rs