Address cmake compilation (#17314)
thiagoftsm committed
Apr 17, 2024 at 18:48 UTC
668e63e748bd546a6af0eb2bc0884cc53703381a
2 files changed
+31
-8
CMakeLists.txt
+27
-4
@@ -657,10 +657,17 @@ set(LIBNETDATA_FILES
657
)
658
659
if(ENABLE_PLUGIN_EBPF)
660
- list(APPEND LIBNETDATA_FILES
661
- src/libnetdata/ebpf/ebpf.c
662
- src/libnetdata/ebpf/ebpf.h
663
- )
660
+ message(CHECK_START "Checking for vendored libbpf for eBPF plugin")
661
+ if (EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/libbpf/libbpf.a" AND EXISTS "${CMAKE_SOURCE_DIR}/src/libnetdata/ebpf/includes/dc.skel.h")
662
+ message(CHECK_PASS "found")
663
+ list(APPEND LIBNETDATA_FILES
664
+ src/libnetdata/ebpf/ebpf.c
665
+ src/libnetdata/ebpf/ebpf.h
666
+ )
667
+ else()
668
+ message(CHECK_FAIL "not found")
669
+ message(FATAL_ERROR "eBPF plugin requires a vendored copy of libbpf.")
670
+ endif()
671
endif()
672
673
set(LIBH2O_FILES
@@ -1898,6 +1905,22 @@ if(ENABLE_PLUGIN_EBPF)
1905
src/collectors/ebpf.plugin/ebpf_unittest.h
1906
src/collectors/ebpf.plugin/ebpf_functions.c
1907
src/collectors/ebpf.plugin/ebpf_functions.h
1908
+ src/libnetdata/ebpf/includes/cachestat.skel.h
1909
+ src/libnetdata/ebpf/includes/dc.skel.h
1910
+ src/libnetdata/ebpf/includes/disk.skel.h
1911
+ src/libnetdata/ebpf/includes/fd.skel.h
1912
+ src/libnetdata/ebpf/includes/filesystem.skel.h
1913
+ src/libnetdata/ebpf/includes/hardirq.skel.h
1914
+ src/libnetdata/ebpf/includes/mdflush.skel.h
1915
+ src/libnetdata/ebpf/includes/mount.skel.h
1916
+ src/libnetdata/ebpf/includes/oomkill.skel.h
1917
+ src/libnetdata/ebpf/includes/process.skel.h
1918
+ src/libnetdata/ebpf/includes/shm.skel.h
1919
+ src/libnetdata/ebpf/includes/socket.skel.h
1920
+ src/libnetdata/ebpf/includes/softirq.skel.h
1921
+ src/libnetdata/ebpf/includes/swap.skel.h
1922
+ src/libnetdata/ebpf/includes/sync.skel.h
1923
+ src/libnetdata/ebpf/includes/vfs.skel.h
1924
)
1925
1926
add_executable(ebpf.plugin ${EBPF_PLUGIN_FILES})
src/collectors/ebpf.plugin/ebpf_swap.c
+4
-4
@@ -92,9 +92,9 @@ static inline void ebpf_swap_disable_specific_probe(struct swap_bpf *obj)
92
{
93
if (!strcmp(swap_targets[NETDATA_KEY_SWAP_READPAGE_CALL].name,
94
swap_read[NETDATA_KEY_SWAP_READPAGE_CALL])) {
95
- bpf_program__set_autoload(obj->progs.netdata_swap_readpage_probe, false);
96
- } else {
95
bpf_program__set_autoload(obj->progs.netdata_swap_read_folio_probe, false);
96
+ } else {
97
+ bpf_program__set_autoload(obj->progs.netdata_swap_readpage_probe, false);
98
}
99
}
100
@@ -123,9 +123,9 @@ static inline void ebpf_swap_disable_specific_trampoline(struct swap_bpf *obj)
123
{
124
if (!strcmp(swap_targets[NETDATA_KEY_SWAP_READPAGE_CALL].name,
125
swap_read[NETDATA_KEY_SWAP_READPAGE_CALL])) {
126
- bpf_program__set_autoload(obj->progs.netdata_swap_readpage_fentry, false);
127
- } else {
126
bpf_program__set_autoload(obj->progs.netdata_swap_read_folio_fentry, false);
127
+ } else {
128
+ bpf_program__set_autoload(obj->progs.netdata_swap_readpage_fentry, false);
129
}
130
}
131