opensourcemirror
/
netdata
mirror of https://github.com/netdata/netdata.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Address cmake compilation (#17314)

This commit is contained in:
thiagoftsm 2024-04-17 18:48:48 +00:00 committed by GitHub
parent 2d70c2e0c9
commit 668e63e748
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -657,10 +657,17 @@ set(LIBNETDATA_FILES
)
if(ENABLE_PLUGIN_EBPF)
list(APPEND LIBNETDATA_FILES
src/libnetdata/ebpf/ebpf.c
src/libnetdata/ebpf/ebpf.h
)
message(CHECK_START "Checking for vendored libbpf for eBPF plugin")
if (EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/libbpf/libbpf.a" AND EXISTS "${CMAKE_SOURCE_DIR}/src/libnetdata/ebpf/includes/dc.skel.h")
message(CHECK_PASS "found")
list(APPEND LIBNETDATA_FILES
src/libnetdata/ebpf/ebpf.c
src/libnetdata/ebpf/ebpf.h
)
else()
message(CHECK_FAIL "not found")
message(FATAL_ERROR "eBPF plugin requires a vendored copy of libbpf.")
endif()
endif()
set(LIBH2O_FILES
@ -1898,6 +1905,22 @@ if(ENABLE_PLUGIN_EBPF)
src/collectors/ebpf.plugin/ebpf_unittest.h
src/collectors/ebpf.plugin/ebpf_functions.c
src/collectors/ebpf.plugin/ebpf_functions.h
src/libnetdata/ebpf/includes/cachestat.skel.h
src/libnetdata/ebpf/includes/dc.skel.h
src/libnetdata/ebpf/includes/disk.skel.h
src/libnetdata/ebpf/includes/fd.skel.h
src/libnetdata/ebpf/includes/filesystem.skel.h
src/libnetdata/ebpf/includes/hardirq.skel.h
src/libnetdata/ebpf/includes/mdflush.skel.h
src/libnetdata/ebpf/includes/mount.skel.h
src/libnetdata/ebpf/includes/oomkill.skel.h
src/libnetdata/ebpf/includes/process.skel.h
src/libnetdata/ebpf/includes/shm.skel.h
src/libnetdata/ebpf/includes/socket.skel.h
src/libnetdata/ebpf/includes/softirq.skel.h
src/libnetdata/ebpf/includes/swap.skel.h
src/libnetdata/ebpf/includes/sync.skel.h
src/libnetdata/ebpf/includes/vfs.skel.h
)
add_executable(ebpf.plugin ${EBPF_PLUGIN_FILES})

8
src/collectors/ebpf.plugin/ebpf_swap.c
View File

@ -92,9 +92,9 @@ static inline void ebpf_swap_disable_specific_probe(struct swap_bpf *obj)
{
if (!strcmp(swap_targets[NETDATA_KEY_SWAP_READPAGE_CALL].name,
swap_read[NETDATA_KEY_SWAP_READPAGE_CALL])) {
bpf_program__set_autoload(obj->progs.netdata_swap_readpage_probe, false);
} else {
bpf_program__set_autoload(obj->progs.netdata_swap_read_folio_probe, false);
} else {
bpf_program__set_autoload(obj->progs.netdata_swap_readpage_probe, false);
}
}
@ -123,9 +123,9 @@ static inline void ebpf_swap_disable_specific_trampoline(struct swap_bpf *obj)
{
if (!strcmp(swap_targets[NETDATA_KEY_SWAP_READPAGE_CALL].name,
swap_read[NETDATA_KEY_SWAP_READPAGE_CALL])) {
bpf_program__set_autoload(obj->progs.netdata_swap_readpage_fentry, false);
} else {
bpf_program__set_autoload(obj->progs.netdata_swap_read_folio_fentry, false);
} else {
bpf_program__set_autoload(obj->progs.netdata_swap_readpage_fentry, false);
}
}