diff --git a/pnet_packet/Cargo.toml b/pnet_packet/Cargo.toml index d4d0d71a..7728ea54 100644 --- a/pnet_packet/Cargo.toml +++ b/pnet_packet/Cargo.toml @@ -18,6 +18,12 @@ pnet_macros = { path = "../pnet_macros", version = "0.29.0" } [dev-dependencies] hex = "0.4.3" +criterion = {version = "0.3.5", features = ["html_reports"]} #added HTML feature becuase of the annoying warnings when running the tests [build-dependencies] glob = "0.3.0" + +[[bench]] +name = "bench_pnet_packet" +path = "benches/packet_benchmarks.rs" +harness = false \ No newline at end of file diff --git a/pnet_packet/benches/packet_benchmarks.rs b/pnet_packet/benches/packet_benchmarks.rs index 3889d135..97070ffe 100644 --- a/pnet_packet/benches/packet_benchmarks.rs +++ b/pnet_packet/benches/packet_benchmarks.rs @@ -1,6 +1,5 @@ -#![feature(test)] -extern crate test; -use test::{Bencher, black_box}; +//Using criterion so that we dont need to use the test framework which requires nightly toolchain +use criterion::{criterion_group, criterion_main, Criterion, black_box}; use pnet_packet::ethernet::EthernetPacket; use pnet_packet::ethernet::MutableEthernetPacket; @@ -9,48 +8,68 @@ use pnet_base::MacAddr; use pnet_packet::Packet; use pnet_packet::ipv4::Ipv4Packet; -#[bench] -fn bench_packet_new_constructor(b: &mut Bencher) { + +fn bench_packet_new_constructor(c: &mut Criterion) { let buffer = vec![0; 20]; - b.iter(|| EthernetPacket::new(black_box(&buffer)).unwrap()); + c.bench_function("EthernetPacket New Packet", |b| { + b.iter(|| + EthernetPacket::new(black_box(&buffer)).unwrap() + ); + }); } -#[bench] -fn bench_packet_get_source(b: &mut Bencher) { +fn bench_packet_get_source(c: &mut Criterion) { let buffer = vec![0; 20]; let packet = EthernetPacket::new(&buffer).unwrap(); - b.iter(|| black_box(packet.get_source())); + c.bench_function("EthernetPacket Get Source", |b| { + b.iter(|| + black_box(packet.get_source()) + ); + }); } -#[bench] -fn bench_packet_set_source_black_box(b: &mut Bencher) { +fn bench_packet_set_source_black_box(c: &mut Criterion) { let mut buffer = vec![0; 20]; let mut packet = MutableEthernetPacket::new(&mut buffer).unwrap(); let mac = MacAddr::new(1, 2, 3, 4, 5, 6); - b.iter(|| packet.set_source(black_box(mac))); + c.bench_function("EthernetPacket Set Source", |b| { + b.iter(|| + packet.set_source(black_box(mac)) + ); + }); } -#[bench] -fn bench_packet_mutable_to_immutable(b: &mut Bencher) { +fn bench_packet_mutable_to_immutable(c: &mut Criterion) { let mut buffer = vec![0; 20]; let mut packet = MutableEthernetPacket::new(&mut buffer).unwrap(); - b.iter(|| black_box(packet.to_immutable())); + c.bench_function("Mutable to Immutable", |b| { + b.iter(|| + black_box(packet.to_immutable()) + ); + }); } -#[bench] -fn bench_packet_immutable_to_immutable(b: &mut Bencher) { +fn bench_packet_immutable_to_immutable(c: &mut Criterion) { let mut buffer = vec![0; 20]; let mut packet = EthernetPacket::new(&mut buffer).unwrap(); - b.iter(|| black_box(packet.to_immutable())); + c.bench_function("Immutable to Immutable", |b| { + b.iter(|| + black_box(packet.to_immutable()) + ); + }); } -#[bench] -fn bench_ipv4_parsing(b: &mut Bencher) { +fn bench_ipv4_parsing(c: &mut Criterion) { let data = hex::decode("000c291ce319ecf4bbd93e7d08004500002e1b6540008006cd76c0a8c887c0a8c8151a3707d0dd6abb2b1f5fd25150180402120f000068656c6c6f0a").unwrap(); let ethernet = EthernetPacket::new(&data).unwrap(); let payload = ethernet.payload().clone(); - b.iter(|| - Ipv4Packet::new(black_box(&payload)) - ); - + c.bench_function("IPV4 Parsing", |b| { + b.iter(|| + Ipv4Packet::new(black_box(&payload)) + ); + }); } + +criterion_group!(benches, bench_packet_new_constructor, bench_packet_get_source, bench_packet_set_source_black_box, bench_packet_mutable_to_immutable, bench_packet_immutable_to_immutable, bench_ipv4_parsing); + +criterion_main!(benches); \ No newline at end of file