general cleanup

capsule-rs · Feb 26, 2022 · 8e818aa · 8e818aa
1 parent 34a01a3
commit 8e818aa
Show file tree

Hide file tree

Showing 90 changed files with 498 additions and 6,172 deletions.
diff --git a/bench/Cargo.toml b/bench/Cargo.toml
@@ -11,7 +11,7 @@ Benchmarks for Capsule.
 
 [dev-dependencies]
 anyhow = "1.0"
-capsule = { version = "0.1", path = "../core", features = ["testils"] }
+capsule = { version = "0.2", path = "../core", features = ["testils"] }
 criterion = "0.3"
 proptest = "1.0"
 
@@ -20,11 +20,6 @@ name = "packets"
 path = "packets.rs"
 harness = false
 
-[[bench]]
-name = "combinators"
-path = "combinators.rs"
-harness = false
-
 [[bench]]
 name = "mbuf"
 path = "mbuf.rs"

diff --git a/bench/combinators.rs b/bench/combinators.rs
diff --git a/bench/mbuf.rs b/bench/mbuf.rs
@@ -17,7 +17,7 @@
 */
 
 use anyhow::Result;
-use capsule::Mbuf;
+use capsule::packets::Mbuf;
 use criterion::{criterion_group, criterion_main, Criterion};
 
 const BATCH_SIZE: usize = 100;

diff --git a/bench/packets.rs b/bench/packets.rs
@@ -17,13 +17,15 @@
 */
 
 use anyhow::Result;
+use capsule::fieldmap;
+use capsule::packets::ethernet::Ethernet;
 use capsule::packets::ip::v4::Ipv4;
 use capsule::packets::ip::v6::{Ipv6, SegmentRouting};
-use capsule::packets::{Ethernet, Packet, Udp4};
+use capsule::packets::udp::Udp4;
+use capsule::packets::{Mbuf, Packet};
 use capsule::testils::criterion::BencherExt;
 use capsule::testils::proptest::*;
 use capsule::testils::{PacketExt, Rvg};
-use capsule::{fieldmap, Mbuf};
 use criterion::{criterion_group, criterion_main, Criterion};
 use proptest::prelude::*;
 use std::net::Ipv6Addr;

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "capsule"
-version = "0.1.5"
+version = "0.2.0"
 authors = ["Capsule Developers <[email protected]>"]
 license = "Apache-2.0"
 edition = "2018"
@@ -23,24 +23,17 @@ doctest = false
 anyhow = "1.0"
 async-channel = "1.6"
 async-executor = "1.4"
-capsule-ffi = { version = "0.1.5", path = "../ffi" }
-capsule-macros = { version = "0.1.5", path = "../macros" }
+capsule-ffi = { version = "0.2.0", path = "../ffi" }
+capsule-macros = { version = "0.2.0", path = "../macros" }
 clap = "2.33"
 criterion = { version = "0.3", optional = true }
-futures-lite = "1.11"
-futures-preview = "=0.3.0-alpha.19"
+futures-lite = "1.12"
 libc = "0.2"
-metrics-core = { version = "0.5", optional = true }
-metrics-runtime = { version = "0.13", optional = true, default-features = false }
-once_cell = "1.7"
+once_cell = "1.9"
 proptest = { version = "1.0", optional = true }
-regex = "1"
+regex = "1.5"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
-tokio = "=0.2.0-alpha.6"
-tokio-executor = { version = "=0.2.0-alpha.6", features = ["current-thread", "threadpool"] }
-tokio-net = { version = "=0.2.0-alpha.6", features = ["signal"] }
-tokio-timer = "=0.3.0-alpha.6"
 toml = "0.5"
 tracing = "0.1"
 
@@ -49,10 +42,9 @@ criterion = "0.3"
 proptest = { version = "1.0", default-features = false, features = ["default-code-coverage"] }
 
 [features]
-default = ["metrics"]
+default = []
 compile_failure = []    # compiler tests to check mutability rules are followed
-full = ["metrics", "pcap-dump", "testils"]
-metrics = ["metrics-core", "metrics-runtime"]
+full = ["pcap-dump", "testils"]
 pcap-dump = []
 testils = ["criterion", "proptest"]
 

diff --git a/core/src/batch/emit.rs b/core/src/batch/emit.rs