Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0.2.0 alpha #138

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

0.2.0 alpha #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0355170
new pattern for ffi
drunkirishcoder Mar 10, 2021
836e686
new core runtime
drunkirishcoder Mar 15, 2021
71688c7
new mbuf allocation
drunkirishcoder Mar 17, 2021
6288f0e
new port rx and tx loops
drunkirishcoder Mar 20, 2021
df52a1a
completely revamp examples
drunkirishcoder Mar 27, 2021
565b611
redo packet capture dump
drunkirishcoder Mar 29, 2021
87ef83e
general cleanup
drunkirishcoder Mar 29, 2021
1232a4c
ignore sanitize error
drunkirishcoder Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ jobs:
/bin/bash -c "rustup install nightly && rustup default nightly \
&& rustup component add rust-src \
&& cargo run --target x86_64-unknown-linux-gnu -Zbuild-std -- -f pktdump.toml"
continue-on-error: true

test:
runs-on: ubuntu-18.04
Expand Down
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ members = [
"examples/nat64",
"examples/ping4d",
"examples/pktdump",
"examples/signals",
zeeshanlakhani marked this conversation as resolved.
Show resolved Hide resolved
"examples/skeleton",
"examples/syn-flood",
"ffi",
Expand Down
7 changes: 1 addition & 6 deletions bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand Down
229 changes: 0 additions & 229 deletions bench/combinators.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bench/mbuf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions bench/packets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
25 changes: 10 additions & 15 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "capsule"
version = "0.1.5"
version = "0.2.0"
authors = ["Capsule Developers <capsule-dev@googlegroups.com>"]
license = "Apache-2.0"
edition = "2018"
Expand All @@ -21,23 +21,19 @@ doctest = false

[dependencies]
anyhow = "1.0"
capsule-ffi = { version = "0.1.5", path = "../ffi" }
capsule-macros = { version = "0.1.5", path = "../macros" }
async-channel = "1.6"
async-executor = "1.4"
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-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"

Expand All @@ -46,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"]

Expand Down
Loading