yanguangshaonian
/
aya
mirror of https://github.com/aya-rs/aya
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(ebpf): Remove PerfEventArray::with_max_entries

Browse Source 
This API doesn't make sense as the max_entries needs to be set to the
number of online CPUs by the loader.

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
pull/1004/head
Dave Tucker 6 months ago committed by Michal Rostecki
parent e12fcf46cb
commit ef0d1253ef
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File

10
ebpf/aya-ebpf/src/maps/perf/perf_event_array.rs
Unescape Escape View File

@ -17,16 +17,12 @@ unsafe impl<T: Sync> Sync for PerfEventArray<T> {}
impl<T> PerfEventArray<T> {
pub const fn new(flags: u32) -> PerfEventArray<T> {
PerfEventArray::with_max_entries(0, flags)
}
pub const fn with_max_entries(max_entries: u32, flags: u32) -> PerfEventArray<T> {
PerfEventArray {
def: UnsafeCell::new(bpf_map_def {
type_: BPF_MAP_TYPE_PERF_EVENT_ARRAY,
key_size: mem::size_of::<u32>() as u32,
value_size: mem::size_of::<u32>() as u32,
max_entries,
max_entries: 0,
map_flags: flags,
id: 0,
pinning: PinningType::None as u32,
@ -35,13 +31,13 @@ impl<T> PerfEventArray<T> {
}
}
pub const fn pinned(max_entries: u32, flags: u32) -> PerfEventArray<T> {
pub const fn pinned(flags: u32) -> PerfEventArray<T> {
PerfEventArray {
def: UnsafeCell::new(bpf_map_def {
type_: BPF_MAP_TYPE_PERF_EVENT_ARRAY,
key_size: mem::size_of::<u32>() as u32,
value_size: mem::size_of::<u32>() as u32,
max_entries,
max_entries: 0,
map_flags: flags,
id: 0,
pinning: PinningType::ByName as u32,

10
ebpf/aya-ebpf/src/maps/perf/perf_event_byte_array.rs
Unescape Escape View File

@ -16,16 +16,12 @@ unsafe impl Sync for PerfEventByteArray {}
impl PerfEventByteArray {
pub const fn new(flags: u32) -> PerfEventByteArray {
PerfEventByteArray::with_max_entries(0, flags)
}
pub const fn with_max_entries(max_entries: u32, flags: u32) -> PerfEventByteArray {
PerfEventByteArray {
def: UnsafeCell::new(bpf_map_def {
type_: BPF_MAP_TYPE_PERF_EVENT_ARRAY,
key_size: mem::size_of::<u32>() as u32,
value_size: mem::size_of::<u32>() as u32,
max_entries,
max_entries: 0,
map_flags: flags,
id: 0,
pinning: PinningType::None as u32,
@ -33,13 +29,13 @@ impl PerfEventByteArray {
}
}
pub const fn pinned(max_entries: u32, flags: u32) -> PerfEventByteArray {
pub const fn pinned(flags: u32) -> PerfEventByteArray {
PerfEventByteArray {
def: UnsafeCell::new(bpf_map_def {
type_: BPF_MAP_TYPE_PERF_EVENT_ARRAY,
key_size: mem::size_of::<u32>() as u32,
value_size: mem::size_of::<u32>() as u32,
max_entries,
max_entries: 0,
map_flags: flags,
id: 0,
pinning: PinningType::ByName as u32,

12
xtask/public-api/aya-ebpf.txt
Unescape Escape View File

@ -356,8 +356,7 @@ impl<T> aya_ebpf::maps::PerfEventArray<T>
pub const fn aya_ebpf::maps::PerfEventArray<T>::new(flags: u32) -> aya_ebpf::maps::PerfEventArray<T>
pub fn aya_ebpf::maps::PerfEventArray<T>::output<C: aya_ebpf::EbpfContext>(&self, ctx: &C, data: &T, flags: u32)
pub fn aya_ebpf::maps::PerfEventArray<T>::output_at_index<C: aya_ebpf::EbpfContext>(&self, ctx: &C, index: u32, data: &T, flags: u32)
pub const fn aya_ebpf::maps::PerfEventArray<T>::pinned(max_entries: u32, flags: u32) -> aya_ebpf::maps::PerfEventArray<T>
pub const fn aya_ebpf::maps::PerfEventArray<T>::with_max_entries(max_entries: u32, flags: u32) -> aya_ebpf::maps::PerfEventArray<T>
pub const fn aya_ebpf::maps::PerfEventArray<T>::pinned(flags: u32) -> aya_ebpf::maps::PerfEventArray<T>
impl<T: core::marker::Sync> core::marker::Sync for aya_ebpf::maps::PerfEventArray<T>
impl<T> !core::marker::Freeze for aya_ebpf::maps::PerfEventArray<T>
impl<T> core::marker::Send for aya_ebpf::maps::PerfEventArray<T> where T: core::marker::Send
@ -385,8 +384,7 @@ impl aya_ebpf::maps::PerfEventByteArray
pub const fn aya_ebpf::maps::PerfEventByteArray::new(flags: u32) -> aya_ebpf::maps::PerfEventByteArray
pub fn aya_ebpf::maps::PerfEventByteArray::output<C: aya_ebpf::EbpfContext>(&self, ctx: &C, data: &[u8], flags: u32)
pub fn aya_ebpf::maps::PerfEventByteArray::output_at_index<C: aya_ebpf::EbpfContext>(&self, ctx: &C, index: u32, data: &[u8], flags: u32)
pub const fn aya_ebpf::maps::PerfEventByteArray::pinned(max_entries: u32, flags: u32) -> aya_ebpf::maps::PerfEventByteArray
pub const fn aya_ebpf::maps::PerfEventByteArray::with_max_entries(max_entries: u32, flags: u32) -> aya_ebpf::maps::PerfEventByteArray
pub const fn aya_ebpf::maps::PerfEventByteArray::pinned(flags: u32) -> aya_ebpf::maps::PerfEventByteArray
impl core::marker::Sync for aya_ebpf::maps::PerfEventByteArray
impl !core::marker::Freeze for aya_ebpf::maps::PerfEventByteArray
impl core::marker::Send for aya_ebpf::maps::PerfEventByteArray
@ -1085,8 +1083,7 @@ impl<T> aya_ebpf::maps::PerfEventArray<T>
pub const fn aya_ebpf::maps::PerfEventArray<T>::new(flags: u32) -> aya_ebpf::maps::PerfEventArray<T>
pub fn aya_ebpf::maps::PerfEventArray<T>::output<C: aya_ebpf::EbpfContext>(&self, ctx: &C, data: &T, flags: u32)
pub fn aya_ebpf::maps::PerfEventArray<T>::output_at_index<C: aya_ebpf::EbpfContext>(&self, ctx: &C, index: u32, data: &T, flags: u32)
pub const fn aya_ebpf::maps::PerfEventArray<T>::pinned(max_entries: u32, flags: u32) -> aya_ebpf::maps::PerfEventArray<T>
pub const fn aya_ebpf::maps::PerfEventArray<T>::with_max_entries(max_entries: u32, flags: u32) -> aya_ebpf::maps::PerfEventArray<T>
pub const fn aya_ebpf::maps::PerfEventArray<T>::pinned(flags: u32) -> aya_ebpf::maps::PerfEventArray<T>
impl<T: core::marker::Sync> core::marker::Sync for aya_ebpf::maps::PerfEventArray<T>
impl<T> !core::marker::Freeze for aya_ebpf::maps::PerfEventArray<T>
impl<T> core::marker::Send for aya_ebpf::maps::PerfEventArray<T> where T: core::marker::Send
@ -1114,8 +1111,7 @@ impl aya_ebpf::maps::PerfEventByteArray
pub const fn aya_ebpf::maps::PerfEventByteArray::new(flags: u32) -> aya_ebpf::maps::PerfEventByteArray
pub fn aya_ebpf::maps::PerfEventByteArray::output<C: aya_ebpf::EbpfContext>(&self, ctx: &C, data: &[u8], flags: u32)
pub fn aya_ebpf::maps::PerfEventByteArray::output_at_index<C: aya_ebpf::EbpfContext>(&self, ctx: &C, index: u32, data: &[u8], flags: u32)
pub const fn aya_ebpf::maps::PerfEventByteArray::pinned(max_entries: u32, flags: u32) -> aya_ebpf::maps::PerfEventByteArray
pub const fn aya_ebpf::maps::PerfEventByteArray::with_max_entries(max_entries: u32, flags: u32) -> aya_ebpf::maps::PerfEventByteArray
pub const fn aya_ebpf::maps::PerfEventByteArray::pinned(flags: u32) -> aya_ebpf::maps::PerfEventByteArray
impl core::marker::Sync for aya_ebpf::maps::PerfEventByteArray
impl !core::marker::Freeze for aya_ebpf::maps::PerfEventByteArray
impl core::marker::Send for aya_ebpf::maps::PerfEventByteArray

Write Preview
Loading…
Cancel
Save