Unite libbpf includes

Currently we include headers from local libbpf subpackage, which does not work if user specify LIBBPF_INCLUDE_DIR. Adding HAVE_EXTERNAL_LIBBPF macro, that gets defined when user specifies libbpf header path. This macro is checked in bcc_libbpf_inc.h and proper files are included. Using bcc_libbpf_inc.h in place of libbpf includes. Signed-off-by: Jiri Olsa <[email protected]>
Ha-Dj · Feb 27, 2020 · 1e7862f · 1e7862f
1 parent 18da40c
commit 1e7862f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
@@ -28,13 +28,15 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}")
 
 include(static_libstdc++)
 
-if(LIBBPF_FOUND)
- # We need to include the libbpf packaged source to get the
- # headers location, becaseu they are installed under 'bpf'
- # directory, but the libbpf code references them localy
-
- include_directories(${LIBBPF_INCLUDE_DIR}/bpf)
+if(LIBBPF_INCLUDE_DIR)
+ # Add user libbpf include and notify compilation
+ # that we are using external libbpf. It's checked
+ # in src/cc/libbpf.h and proper files are included.
+ include_directories(${LIBBPF_INCLUDE_DIR})
+ add_definitions(-DHAVE_EXTERNAL_LIBBPF)
+endif()
 
+if(LIBBPF_FOUND)
  set(extract_dir ${CMAKE_CURRENT_BINARY_DIR}/libbpf_a_extract)
  execute_process(COMMAND sh -c "mkdir -p ${extract_dir} && cd ${extract_dir} && ${CMAKE_AR} x ${LIBBPF_STATIC_LIBRARIES}")
  file(GLOB libbpf_sources "${extract_dir}/*.o")

diff --git a/src/cc/bcc_btf.cc b/src/cc/bcc_btf.cc
@@ -19,8 +19,7 @@
 #include <string.h>
 #include "linux/btf.h"
 #include "libbpf.h"
-#include "libbpf/src/libbpf.h"
-#include "libbpf/src/btf.h"
+#include "bcc_libbpf_inc.h"
 #include <vector>
 
 #define BCC_MAX_ERRNO 4095

diff --git a/src/cc/bcc_libbpf_inc.h b/src/cc/bcc_libbpf_inc.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#ifdef HAVE_EXTERNAL_LIBBPF
+# include <bpf/bpf.h>
+# include <bpf/btf.h>
+# include <bpf/libbpf.h>
+#else
+# include "libbpf/src/bpf.h"
+# include "libbpf/src/btf.h"
+# include "libbpf/src/libbpf.h"
+#endif
diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
@@ -45,7 +45,7 @@
 #include "exported_files.h"
 #include "libbpf.h"
 #include "bcc_btf.h"
-#include "libbpf/src/bpf.h"
+#include "bcc_libbpf_inc.h"
 
 namespace ebpf {
 

diff --git a/src/cc/frontends/clang/b_frontend_action.cc b/src/cc/frontends/clang/b_frontend_action.cc
@@ -34,7 +34,7 @@
 #include "loader.h"
 #include "table_storage.h"
 #include "arch_helper.h"
-#include "libbpf/src/bpf.h"
+#include "bcc_libbpf_inc.h"
 
 #include "libbpf.h"
 

diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
@@ -52,8 +52,7 @@
 // TODO: Remove this when CentOS 6 support is not needed anymore
 #include "setns.h"
 
-#include "libbpf/src/bpf.h"
-#include "libbpf/src/libbpf.h"
+#include "bcc_libbpf_inc.h"
 
 // TODO: remove these defines when linux-libc-dev exports them properly