Skip to content

Commit

Permalink
merge big ebpf refactoring
Browse files Browse the repository at this point in the history
Big refactor
  • Loading branch information
der-whity authored Jan 29, 2025
2 parents 8a49f56 + 7a7954f commit ca1ce0a
Show file tree
Hide file tree
Showing 101 changed files with 4,550 additions and 4,595 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Cargo Clippy
run: |
cd rust
nix develop --command cargo clippy --workspace --all-targets --all-features --exclude backend-ebpf
nix develop --command cargo clippy --workspace --all-targets --all-features --exclude ebpf-refactored
# nix develop --command cargo clippy --workspace --all-targets --all-features --package backend-ebpf -- -C panic=abort -Zpanic_abort_tests
rust-test:
Expand All @@ -68,7 +68,7 @@ jobs:
- name: Cargo test
run: |
cd rust
nix develop --command cargo test --workspace --all-targets --all-features --exclude client --exclude backend-ebpf-test --exclude backend-daemon
nix develop --command cargo test --workspace --all-targets --all-features --exclude client --exclude ebpf-test-refactored --exclude backend-daemon
rust-build:
name: Rust Build
Expand Down
185 changes: 123 additions & 62 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 12 additions & 11 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,23 @@ resolver = "2"
members = [
"xtask",
"backend/daemon",
"backend/ebpf",
"backend/common",
"shared",
"client",
"playground/sendmsg-demo",
"playground/ebpf-types",
"playground/ebpf-test-refactored",
"playground/ebpf-relocation-helpers",
"playground/ebpf-refactored",
"uniffi-bindgen",
"backend/ebpf-test",
"runner",
"garbage-collection",
]
default-members = [
"xtask",
"backend/daemon",
"backend/common",
"shared",
"client",
]
exclude = [
"playground/ebpf-refactored",
"playground/ebpf-test-refactored",
"playground/ebpf-types",
]

[workspace.package]
license = "MIT"
Expand Down Expand Up @@ -66,9 +61,7 @@ uniffi = { version = "0.28.3" }
thiserror = "2.0.6"
shared = { path = "./shared" }
xtask = { path = "./xtask" }
backend-common = { path = "./backend/common" }
backend-daemon = { path = "./backend/daemon" }
backend-ebpf = { path = "./backend/ebpf" }
runner = { path = "./runner" }
garbage-collection = { path = "./garbage-collection" }
tracing = { version = "0.1.41" }
Expand Down Expand Up @@ -98,6 +91,14 @@ tower = { version = "0.5.2" }
hyper-util = { version = "0.1.10", features = ["tokio"] }
clang = "2.0.0"
clang-sys = "1.8.1"
test-log = { version = "0.2.17", default-features = false, features = ["color", "log", "trace"] }
ebpf-types = { path = "./playground/ebpf-types" }
ebpf-relocation-helpers = { path = "./playground/ebpf-relocation-helpers" }
paste = "1.0.15"
bindgen = "0.71.1"
cc = "1.2.10"
syscall-numbers = "4.0.1"


[profile.release.package.backend-ebpf]
debug = 2
Expand Down
24 changes: 0 additions & 24 deletions rust/backend/common/Cargo.toml

This file was deleted.

Loading

0 comments on commit ca1ce0a

Please sign in to comment.