Merge branch 'master' into nalgebra

Cargo.toml

@@ -16,13 +16,17 @@ smallvec = { version = "1.8" }
 
 [dev-dependencies]
 once_cell = "1.11"
-pprof = { version = "0.9", features = ["flamegraph", "criterion"] }
+pprof = { version = "0.9", features = ["flamegraph", "protobuf-codec", "criterion"] }
 criterion = { version = "0.3", features = ["html_reports"] }
 
 [[bench]]
 name = "flamegraph"
 harness = false
 
+[[bench]]
+name = "protobuf"
+harness = false
+
 [[bench]]
 name = "speed"
 harness = false

benches/flamegraph.rs

@@ -1,9 +1,13 @@
-use std::time::Duration;
+///
+/// Use the pprof-rs profiler outputting a svg flamegraph.
+///
+/// Needs to be called with `--profile-time=<seconds>`
+///
+
 use criterion::{criterion_group, criterion_main, Criterion};
 use pprof::criterion::{PProfProfiler, Output};
 mod common;
 
-static SECOND: Duration = Duration::from_secs(1);
 criterion_group!{
     name = benches;
     config = Criterion::default()

benches/protobuf.rs

@@ -0,0 +1,23 @@
+///
+/// Use the pprof-rs profiler outputting protobuf data.
+///
+/// Then use `go tool pprof` to render graphs from this data.
+/// For example:
+/// - `go tool pprof -svg profile.pb` for a flowchart
+/// - `go tool pprof -http 127.0.0.1:8000` for an interactive view including flowchart and flamegraph
+///
+/// Needs to be called with `--profile-time=<seconds>`
+///
+
+use criterion::{criterion_group, criterion_main, Criterion};
+use pprof::criterion::{PProfProfiler, Output};
+mod common;
+
+criterion_group!{
+    name = benches;
+    config = Criterion::default()
+    .with_profiler(PProfProfiler::new(100, Output::Protobuf))
+    ;
+    targets = common::bezier::all
+}
+criterion_main!(benches);