Skip to content

Commit 7ec721a

Browse files
d-e-s-oanakryiko
authored andcommitted
examples/rust: Update libbpf-rs to 0.22
Update the libbpf-rs (and libbpf-cargo) dependency to version 0.22 to get the latest and greatest. Signed-off-by: Daniel Müller <[email protected]>
1 parent 27607b8 commit 7ec721a

File tree

4 files changed

+106
-15
lines changed

4 files changed

+106
-15
lines changed

examples/rust/Cargo.lock

Lines changed: 98 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/rust/profile/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ edition = "2021"
88
[dependencies]
99
blazesym = { path = "../../../blazesym", features = ["tracing"] }
1010
clap = { version = "4.0", features = ["derive"] }
11-
libbpf-rs = "0.19"
11+
libbpf-rs = "0.22"
1212
libc = "*"
1313
nix = "0.24.1"
1414
tracing = "0.1"
1515
tracing-subscriber = {version = "0.3", features = ["ansi", "env-filter", "fmt"]}
1616

1717
[build-dependencies]
18-
libbpf-cargo = "0.13"
18+
libbpf-cargo = "0.22"

examples/rust/profile/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn main() {
1919
let skel = Path::new("./src/bpf/.output/profile.skel.rs");
2020
SkeletonBuilder::new()
2121
.source(SRC)
22-
.build_and_generate(&skel)
22+
.build_and_generate(skel)
2323
.expect("bpf compilation failed");
2424
println!("cargo:rerun-if-changed={}", SRC);
2525
}

examples/rust/profile/src/main.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ use blazesym::symbolize;
77
use clap::ArgAction;
88
use clap::Parser;
99

10+
use libbpf_rs::skel::OpenSkel as _;
11+
use libbpf_rs::skel::SkelBuilder as _;
12+
1013
use nix::unistd::close;
1114

1215
use tracing::subscriber::set_global_default as set_global_subscriber;
@@ -240,9 +243,10 @@ fn main() -> Result<(), Error> {
240243
let pefds = init_perf_monitor(freq);
241244
let _links = attach_perf_event(&pefds, skel.progs_mut().profile());
242245

246+
let maps = skel.maps();
243247
let mut builder = libbpf_rs::RingBufferBuilder::new();
244248
builder
245-
.add(skel.maps().events(), move |data| {
249+
.add(maps.events(), move |data| {
246250
event_handler(&symbolizer, data)
247251
})
248252
.unwrap();

0 commit comments

Comments
 (0)