htejun · elgohr · Feb 3, 2021 · Mar 1, 2021 · Feb 28, 2021 · Mar 1, 2021
diff --git a/.github/workflows/bcc-test.yml b/.github/workflows/bcc-test.yml
@@ -1,14 +1,17 @@
 name: BCC Build and tests
 
-on: push
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test_bcc:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-16.04, ubuntu-18.04] # 16.04.4 release has 4.15 kernel
-                                         # 18.04.3 release has 5.0.0 kernel
+        os: [ubuntu-18.04, ubuntu-20.04] # 18.04.3 release has 5.0.0 kernel                                        
         env:
         - TYPE: Debug
           PYTHON_TEST_LOGFILE: critical.log

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,6 +1,10 @@
 name: Publish Build Artifacts
 
-on: push
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   publish_images:
@@ -88,10 +92,14 @@ jobs:
           else
             echo "Custom docker credentials not, skipping"
           fi
+      env:
+        DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build container image and publish to registry
       id: publish-registry
-      uses: elgohr/Publish-Docker-Github-Action@2.8
+      uses: elgohr/Publish-Docker-Github-Action@v5
       if: ${{ steps.vars.outputs.DOCKER_PUBLISH }}
       with:
         name: ${{ secrets.DOCKER_IMAGE }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,10 @@
 # Licensed under the Apache License, Version 2.0 (the "License")
 cmake_minimum_required(VERSION 2.8.7)
 
+if (${CMAKE_VERSION} VERSION_EQUAL 3.12.0 OR ${CMAKE_VERSION} VERSION_GREATER 3.12.0)
+  cmake_policy(SET CMP0074 NEW)
+endif()
+
 project(bcc)
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
@@ -14,9 +18,28 @@ endif()
 enable_testing()
 
 # populate submodules (libbpf)
-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
-  execute_process(COMMAND git submodule update --init --recursive
-                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+if(NOT CMAKE_USE_LIBBPF_PACKAGE)
+   if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
+	execute_process(COMMAND git submodule update --init --recursive
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                  RESULT_VARIABLE UPDATE_RESULT)
+  if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
+    message(WARNING "Failed to update submodule libbpf")
+  endif()
+   else()
+	execute_process(COMMAND git diff --shortstat ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/
+		OUTPUT_VARIABLE DIFF_STATUS)
+	if("${DIFF_STATUS}" STREQUAL "")
+		execute_process(COMMAND git submodule update --init --recursive
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                    RESULT_VARIABLE UPDATE_RESULT)
+  if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
+    message(WARNING "Failed to update submodule libbpf")
+  endif()
+	else()
+		message(WARNING "submodule libbpf dirty, so no sync")
+	endif()
+   endif()
 endif()
 
 # It's possible to use other kernel headers with
@@ -27,6 +50,8 @@ endif()
 #  $ cmake -DKERNEL_INCLUDE_DIRS=/tmp/headers/include/ ...
 include_directories(${KERNEL_INCLUDE_DIRS})
 
+option(ENABLE_NO_PIE "Build bcc-lua without PIE" ON)
+
 include(cmake/GetGitRevisionDescription.cmake)
 include(cmake/version.cmake)
 include(CMakeDependentOption)
@@ -39,7 +64,9 @@ option(ENABLE_RTTI "Enable compiling with real time type information" OFF)
 option(ENABLE_LLVM_SHARED "Enable linking LLVM as a shared library" OFF)
 option(ENABLE_CLANG_JIT "Enable Loading BPF through Clang Frontend" ON)
 option(ENABLE_USDT "Enable User-level Statically Defined Tracing" ON)
+option(ENABLE_EXAMPLES "Build examples" ON)
 option(ENABLE_MAN "Build man pages" ON)
+option(ENABLE_TESTS "Build tests" ON)
 CMAKE_DEPENDENT_OPTION(ENABLE_CPP_API "Enable C++ API" ON "ENABLE_USDT" OFF)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -48,13 +75,15 @@ if (CMAKE_USE_LIBBPF_PACKAGE)
   find_package(LibBpf)
 endif()
 
-if(NOT PYTHON_ONLY AND ENABLE_CLANG_JIT)
+if(NOT PYTHON_ONLY)
+find_package(LLVM REQUIRED CONFIG)
+message(STATUS "Found LLVM: ${LLVM_INCLUDE_DIRS} ${LLVM_PACKAGE_VERSION} (Use LLVM_ROOT envronment variable for another version of LLVM)")
+
+if(ENABLE_CLANG_JIT)
 find_package(BISON)
 find_package(FLEX)
-find_package(LLVM REQUIRED CONFIG)
-message(STATUS "Found LLVM: ${LLVM_INCLUDE_DIRS} ${LLVM_PACKAGE_VERSION}")
 find_package(LibElf REQUIRED)
-
+find_package(LibDebuginfod)
 if(CLANG_DIR)
   set(CMAKE_FIND_ROOT_PATH "${CLANG_DIR}")
   include_directories("${CLANG_DIR}/include")
@@ -76,12 +105,14 @@ find_library(libclangRewrite NAMES clangRewrite clang-cpp HINTS ${CLANG_SEARCH})
 find_library(libclangSema NAMES clangSema clang-cpp HINTS ${CLANG_SEARCH})
 find_library(libclangSerialization NAMES clangSerialization clang-cpp HINTS ${CLANG_SEARCH})
 find_library(libclangASTMatchers NAMES clangASTMatchers clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclang-shared libclang-cpp.so HINTS ${CLANG_SEARCH})
 if(libclangBasic STREQUAL "libclangBasic-NOTFOUND")
   message(FATAL_ERROR "Unable to find clang libraries")
 endif()
 FOREACH(DIR ${LLVM_INCLUDE_DIRS})
   include_directories("${DIR}/../tools/clang/include")
 ENDFOREACH()
+endif(ENABLE_CLANG_JIT)
 
 # Set to a string path if system places kernel lib directory in
 # non-default location.
@@ -109,18 +140,22 @@ endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 14)
 
-endif(NOT PYTHON_ONLY AND ENABLE_CLANG_JIT)
+endif(NOT PYTHON_ONLY)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ${CXX_ISYSTEM_DIRS}")
 
 add_subdirectory(src)
 add_subdirectory(introspection)
 if(ENABLE_CLANG_JIT)
+if(ENABLE_EXAMPLES)
 add_subdirectory(examples)
+endif(ENABLE_EXAMPLES)
 if(ENABLE_MAN)
 add_subdirectory(man)
 endif(ENABLE_MAN)
+if(ENABLE_TESTS)
 add_subdirectory(tests)
+endif(ENABLE_TESTS)
 add_subdirectory(tools)
 endif(ENABLE_CLANG_JIT)
diff --git a/Dockerfile.tests b/Dockerfile.tests
@@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y \
       libtinfo-dev
 
 RUN pip3 install pyroute2 netaddr dnslib cachetools
-RUN pip install pyroute2 netaddr dnslib cachetools
+RUN pip install pyroute2==0.5.18 netaddr==0.8.0 dnslib==0.9.14 cachetools==3.1.1
 
 # FIXME this is faster than building from source, but it seems there is a bug
 # in probing libruby.so rather than ruby binary

diff --git a/FAQ.txt b/FAQ.txt
@@ -8,13 +8,13 @@ Q: hello_world.py fails with:
    OSError: libbcc.so: cannot open shared object file: No such file or directory
 A: make sure to 'make install' and add the directory
    where libbcc.so was installed into your LD_LIBRARY_PATH
-   export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+   export LD_LIBRARY_PATH=$(dirname `find /usr -name libbcc.so`):$LD_LIBRARY_PATH
 
 Q: hello_world.py fails with:
    ImportError: No module named bcc
 A: checkout "sudo make install" output to find out bpf package installation site,
    add it to the PYTHONPATH env variable before running the program.
-   sudo bash -c 'PYTHONPATH=/usr/lib/python2.7/site-packages python examples/hello_world.py'
+   export PYTHONPATH=$(dirname `find /usr/lib -name bcc`):$PYTHONPATH
 
 Q: hello_world.py still fails with:
    bpf: Operation not permitted