From af8f769b509e4a002c3bd3138fe745ae962de2db Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Sun, 7 Feb 2021 20:25:47 +0000 Subject: [PATCH] Turn the project into a workspace, move code under aya/ --- Cargo.toml | 17 ++--------------- aya/Cargo.toml | 15 +++++++++++++++ {scripts => aya/scripts}/gen-bindings | 0 {src => aya/src}/bpf.rs | 0 {src => aya/src}/generated/bpf_bindings.rs | 0 {src => aya/src}/generated/btf_bindings.rs | 0 .../src}/generated/btf_internal_bindings.rs | 0 {src => aya/src}/generated/mod.rs | 0 {src => aya/src}/generated/perf_bindings.rs | 0 {src => aya/src}/lib.rs | 0 {src => aya/src}/maps/hash_map.rs | 0 {src => aya/src}/maps/mod.rs | 0 {src => aya/src}/maps/perf_map.rs | 0 {src => aya/src}/maps/program_array.rs | 0 {src => aya/src}/obj/btf/btf.rs | 0 {src => aya/src}/obj/btf/mod.rs | 0 {src => aya/src}/obj/btf/relocation.rs | 0 {src => aya/src}/obj/btf/types.rs | 0 {src => aya/src}/obj/mod.rs | 0 {src => aya/src}/obj/relocation.rs | 0 {src => aya/src}/programs/mod.rs | 0 {src => aya/src}/programs/perf_attach.rs | 0 {src => aya/src}/programs/probe.rs | 0 {src => aya/src}/programs/socket_filter.rs | 0 {src => aya/src}/programs/trace_point.rs | 0 {src => aya/src}/programs/xdp.rs | 0 {src => aya/src}/sys/bpf.rs | 0 {src => aya/src}/sys/fake.rs | 0 {src => aya/src}/sys/mod.rs | 0 {src => aya/src}/sys/netlink.rs | 0 {src => aya/src}/sys/perf_event.rs | 0 31 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 aya/Cargo.toml rename {scripts => aya/scripts}/gen-bindings (100%) rename {src => aya/src}/bpf.rs (100%) rename {src => aya/src}/generated/bpf_bindings.rs (100%) rename {src => aya/src}/generated/btf_bindings.rs (100%) rename {src => aya/src}/generated/btf_internal_bindings.rs (100%) rename {src => aya/src}/generated/mod.rs (100%) rename {src => aya/src}/generated/perf_bindings.rs (100%) rename {src => aya/src}/lib.rs (100%) rename {src => aya/src}/maps/hash_map.rs (100%) rename {src => aya/src}/maps/mod.rs (100%) rename {src => aya/src}/maps/perf_map.rs (100%) rename {src => aya/src}/maps/program_array.rs (100%) rename {src => aya/src}/obj/btf/btf.rs (100%) rename {src => aya/src}/obj/btf/mod.rs (100%) rename {src => aya/src}/obj/btf/relocation.rs (100%) rename {src => aya/src}/obj/btf/types.rs (100%) rename {src => aya/src}/obj/mod.rs (100%) rename {src => aya/src}/obj/relocation.rs (100%) rename {src => aya/src}/programs/mod.rs (100%) rename {src => aya/src}/programs/perf_attach.rs (100%) rename {src => aya/src}/programs/probe.rs (100%) rename {src => aya/src}/programs/socket_filter.rs (100%) rename {src => aya/src}/programs/trace_point.rs (100%) rename {src => aya/src}/programs/xdp.rs (100%) rename {src => aya/src}/sys/bpf.rs (100%) rename {src => aya/src}/sys/fake.rs (100%) rename {src => aya/src}/sys/mod.rs (100%) rename {src => aya/src}/sys/netlink.rs (100%) rename {src => aya/src}/sys/perf_event.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 6741082a..68aac4b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,2 @@ -[package] -name = "aya" -version = "0.1.0" -authors = ["Alessandro Decina "] -edition = "2018" - -[dependencies] -libc = { version = "0.2", features = ["extra_traits"] } -thiserror = "1" -object = "0.23" -bytes = "1" -lazy_static = "1" - -[dev-dependencies] -matches = "0.1.8" \ No newline at end of file +[workspace] +members = ["aya"] diff --git a/aya/Cargo.toml b/aya/Cargo.toml new file mode 100644 index 00000000..6741082a --- /dev/null +++ b/aya/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "aya" +version = "0.1.0" +authors = ["Alessandro Decina "] +edition = "2018" + +[dependencies] +libc = { version = "0.2", features = ["extra_traits"] } +thiserror = "1" +object = "0.23" +bytes = "1" +lazy_static = "1" + +[dev-dependencies] +matches = "0.1.8" \ No newline at end of file diff --git a/scripts/gen-bindings b/aya/scripts/gen-bindings similarity index 100% rename from scripts/gen-bindings rename to aya/scripts/gen-bindings diff --git a/src/bpf.rs b/aya/src/bpf.rs similarity index 100% rename from src/bpf.rs rename to aya/src/bpf.rs diff --git a/src/generated/bpf_bindings.rs b/aya/src/generated/bpf_bindings.rs similarity index 100% rename from src/generated/bpf_bindings.rs rename to aya/src/generated/bpf_bindings.rs diff --git a/src/generated/btf_bindings.rs b/aya/src/generated/btf_bindings.rs similarity index 100% rename from src/generated/btf_bindings.rs rename to aya/src/generated/btf_bindings.rs diff --git a/src/generated/btf_internal_bindings.rs b/aya/src/generated/btf_internal_bindings.rs similarity index 100% rename from src/generated/btf_internal_bindings.rs rename to aya/src/generated/btf_internal_bindings.rs diff --git a/src/generated/mod.rs b/aya/src/generated/mod.rs similarity index 100% rename from src/generated/mod.rs rename to aya/src/generated/mod.rs diff --git a/src/generated/perf_bindings.rs b/aya/src/generated/perf_bindings.rs similarity index 100% rename from src/generated/perf_bindings.rs rename to aya/src/generated/perf_bindings.rs diff --git a/src/lib.rs b/aya/src/lib.rs similarity index 100% rename from src/lib.rs rename to aya/src/lib.rs diff --git a/src/maps/hash_map.rs b/aya/src/maps/hash_map.rs similarity index 100% rename from src/maps/hash_map.rs rename to aya/src/maps/hash_map.rs diff --git a/src/maps/mod.rs b/aya/src/maps/mod.rs similarity index 100% rename from src/maps/mod.rs rename to aya/src/maps/mod.rs diff --git a/src/maps/perf_map.rs b/aya/src/maps/perf_map.rs similarity index 100% rename from src/maps/perf_map.rs rename to aya/src/maps/perf_map.rs diff --git a/src/maps/program_array.rs b/aya/src/maps/program_array.rs similarity index 100% rename from src/maps/program_array.rs rename to aya/src/maps/program_array.rs diff --git a/src/obj/btf/btf.rs b/aya/src/obj/btf/btf.rs similarity index 100% rename from src/obj/btf/btf.rs rename to aya/src/obj/btf/btf.rs diff --git a/src/obj/btf/mod.rs b/aya/src/obj/btf/mod.rs similarity index 100% rename from src/obj/btf/mod.rs rename to aya/src/obj/btf/mod.rs diff --git a/src/obj/btf/relocation.rs b/aya/src/obj/btf/relocation.rs similarity index 100% rename from src/obj/btf/relocation.rs rename to aya/src/obj/btf/relocation.rs diff --git a/src/obj/btf/types.rs b/aya/src/obj/btf/types.rs similarity index 100% rename from src/obj/btf/types.rs rename to aya/src/obj/btf/types.rs diff --git a/src/obj/mod.rs b/aya/src/obj/mod.rs similarity index 100% rename from src/obj/mod.rs rename to aya/src/obj/mod.rs diff --git a/src/obj/relocation.rs b/aya/src/obj/relocation.rs similarity index 100% rename from src/obj/relocation.rs rename to aya/src/obj/relocation.rs diff --git a/src/programs/mod.rs b/aya/src/programs/mod.rs similarity index 100% rename from src/programs/mod.rs rename to aya/src/programs/mod.rs diff --git a/src/programs/perf_attach.rs b/aya/src/programs/perf_attach.rs similarity index 100% rename from src/programs/perf_attach.rs rename to aya/src/programs/perf_attach.rs diff --git a/src/programs/probe.rs b/aya/src/programs/probe.rs similarity index 100% rename from src/programs/probe.rs rename to aya/src/programs/probe.rs diff --git a/src/programs/socket_filter.rs b/aya/src/programs/socket_filter.rs similarity index 100% rename from src/programs/socket_filter.rs rename to aya/src/programs/socket_filter.rs diff --git a/src/programs/trace_point.rs b/aya/src/programs/trace_point.rs similarity index 100% rename from src/programs/trace_point.rs rename to aya/src/programs/trace_point.rs diff --git a/src/programs/xdp.rs b/aya/src/programs/xdp.rs similarity index 100% rename from src/programs/xdp.rs rename to aya/src/programs/xdp.rs diff --git a/src/sys/bpf.rs b/aya/src/sys/bpf.rs similarity index 100% rename from src/sys/bpf.rs rename to aya/src/sys/bpf.rs diff --git a/src/sys/fake.rs b/aya/src/sys/fake.rs similarity index 100% rename from src/sys/fake.rs rename to aya/src/sys/fake.rs diff --git a/src/sys/mod.rs b/aya/src/sys/mod.rs similarity index 100% rename from src/sys/mod.rs rename to aya/src/sys/mod.rs diff --git a/src/sys/netlink.rs b/aya/src/sys/netlink.rs similarity index 100% rename from src/sys/netlink.rs rename to aya/src/sys/netlink.rs diff --git a/src/sys/perf_event.rs b/aya/src/sys/perf_event.rs similarity index 100% rename from src/sys/perf_event.rs rename to aya/src/sys/perf_event.rs