Merge upstream into master

.github/disabled-workflows/publish.yml

@@ -0,0 +1,105 @@
+name: Publish Build Artifacts
+
+on: push
+
+jobs:
+  publish_images:
+    # Optionally publish container images, guarded by the GitHub secret
+    # QUAY_PUBLISH.
+    # To set this up, sign up for quay.io (you can connect it to your github)
+    # then create a robot user with write access user called "bcc_buildbot",
+    # and add the secret token for it to GitHub secrets as:
+    #   - QUAY_TOKEN = <token from quay.io>
+    name: Publish to quay.io
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        env:
+        - NAME: xenial-release
+          OS_RELEASE: 16.04
+        - NAME: bionic-release
+          OS_RELEASE: 18.04
+        - NAME: focal-release
+          OS_RELEASE: 20.04
+    steps:
+
+    - uses: actions/checkout@v1
+
+    - name: Initialize workflow variables
+      id: vars
+      shell: bash
+      run: |
+          if [ -n "${QUAY_TOKEN}" ];then
+            echo "Quay token is set, will push an image"
+            echo ::set-output name=QUAY_PUBLISH::true
+          else
+            echo "Quay token not set, skipping"
+          fi
+
+      env:
+        QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
+
+    - name: Authenticate with quay.io docker registry
+      if: >
+        steps.vars.outputs.QUAY_PUBLISH
+      env:
+        QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
+      run: ./scripts/docker/auth.sh ${{ github.repository }}
+
+    - name: Package docker image and push to quay.io
+      if: >
+        steps.vars.outputs.QUAY_PUBLISH
+      run: >
+        ./scripts/docker/push.sh
+        ${{ github.repository }}
+        ${{ github.ref }}
+        ${{ github.sha }}
+        ${{ matrix.env['NAME'] }}
+        ${{ matrix.env['OS_RELEASE'] }}
+
+    # Uploads the packages built in docker to the github build as an artifact for convenience
+    - uses: actions/upload-artifact@v1
+      if: >
+        steps.vars.outputs.QUAY_PUBLISH
+      with:
+        name: ${{ matrix.env['NAME'] }}
+        path: output
+
+  # Optionally publish container images to custom docker repository,
+  # guarded by presence of all required github secrets.
+  # GitHub secrets can be configured as follows:
+  #   - DOCKER_IMAGE = docker.io/myorg/bcc
+  #   - DOCKER_USERNAME = username
+  #   - DOCKER_PASSWORD = password
+  publish_dockerhub:
+    name: Publish To Dockerhub
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/checkout@v1
+
+    - name: Initialize workflow variables
+      id: vars
+      shell: bash
+      run: |
+          if [ -n "${DOCKER_IMAGE}" ] && \
+             [ -n "${DOCKER_USERNAME}" ] && \
+             [ -n "${DOCKER_PASSWORD}" ];then
+            echo "Custom docker credentials set, will push an image"
+            echo ::set-output name=DOCKER_PUBLISH::true
+          else
+            echo "Custom docker credentials not, skipping"
+          fi
+
+    - name: Build container image and publish to registry
+      id: publish-registry
+      uses: elgohr/Publish-Docker-Github-Action@2.8
+      if: ${{ steps.vars.outputs.DOCKER_PUBLISH }}
+      with:
+        name: ${{ secrets.DOCKER_IMAGE }}
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        workdir: .
+        dockerfile: Dockerfile.ubuntu
+        snapshot: true
+        cache: ${{ github.event_name != 'schedule' }}

.gitignore

@@ -12,3 +12,7 @@ debian/**/*.log
 *critical.log
 obj-x86_64-linux-gnu
 examples/cgroupid/cgroupid
+
+# Output from docker builds
+scripts/docker/output/
+/output/

CMakeLists.txt

@@ -7,6 +7,10 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "path to install" FORCE)
+endif()
+
 enable_testing()
 
 # populate submodules (libbpf)
@@ -15,6 +19,14 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
+# It's possible to use other kernel headers with
+# KERNEL_INCLUDE_DIRS build variable, like:
+#  $ cd <kernel-dir>
+#  $ make INSTALL_HDR_PATH=/tmp/headers headers_install
+#  $ cd <bcc-dir>
+#  $ cmake -DKERNEL_INCLUDE_DIRS=/tmp/headers/include/ ...
+include_directories(${KERNEL_INCLUDE_DIRS})
+
 include(cmake/GetGitRevisionDescription.cmake)
 include(cmake/version.cmake)
 include(CMakeDependentOption)
@@ -51,19 +63,19 @@ endif()
 # clang is linked as a library, but the library path searching is
 # primitively supported, unlike libLLVM
 set(CLANG_SEARCH "/opt/local/llvm/lib;/usr/lib/llvm-3.7/lib;${LLVM_LIBRARY_DIRS}")
-find_library(libclangAnalysis NAMES clangAnalysis HINTS ${CLANG_SEARCH})
-find_library(libclangAST NAMES clangAST HINTS ${CLANG_SEARCH})
-find_library(libclangBasic NAMES clangBasic HINTS ${CLANG_SEARCH})
-find_library(libclangCodeGen NAMES clangCodeGen HINTS ${CLANG_SEARCH})
-find_library(libclangDriver NAMES clangDriver HINTS ${CLANG_SEARCH})
-find_library(libclangEdit NAMES clangEdit HINTS ${CLANG_SEARCH})
-find_library(libclangFrontend NAMES clangFrontend HINTS ${CLANG_SEARCH})
-find_library(libclangLex NAMES clangLex HINTS ${CLANG_SEARCH})
-find_library(libclangParse NAMES clangParse HINTS ${CLANG_SEARCH})
-find_library(libclangRewrite NAMES clangRewrite HINTS ${CLANG_SEARCH})
-find_library(libclangSema NAMES clangSema HINTS ${CLANG_SEARCH})
-find_library(libclangSerialization NAMES clangSerialization HINTS ${CLANG_SEARCH})
-find_library(libclangASTMatchers NAMES clangASTMatchers HINTS ${CLANG_SEARCH})
+find_library(libclangAnalysis NAMES clangAnalysis clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclangAST NAMES clangAST clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclangBasic NAMES clangBasic clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclangCodeGen NAMES clangCodeGen clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclangDriver NAMES clangDriver clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclangEdit NAMES clangEdit clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclangFrontend NAMES clangFrontend clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclangLex NAMES clangLex clang-cpp HINTS ${CLANG_SEARCH})
+find_library(libclangParse NAMES clangParse clang-cpp HINTS ${CLANG_SEARCH})
+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})
 if(libclangBasic STREQUAL "libclangBasic-NOTFOUND")
   message(FATAL_ERROR "Unable to find clang libraries")
 endif()

Dockerfile.tests

@@ -1,19 +1,19 @@
-# Using ubuntu 19.04 for newer `unshare` command used in tests
-FROM ubuntu:19.04
+FROM ubuntu:18.04
 
 ARG LLVM_VERSION="8"
 ENV LLVM_VERSION=$LLVM_VERSION
 
 RUN apt-get update && apt-get install -y curl gnupg &&\
     llvmRepository="\n\
-deb http://apt.llvm.org/disco/ llvm-toolchain-disco main\n\
-deb-src http://apt.llvm.org/disco/ llvm-toolchain-disco main\n\
-deb http://apt.llvm.org/disco/ llvm-toolchain-disco-${LLVM_VERSION} main\n\
-deb-src http://apt.llvm.org/disco/ llvm-toolchain-disco-${LLVM_VERSION} main\n" &&\
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main\n\
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main\n\
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-${LLVM_VERSION} main\n\
+deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-${LLVM_VERSION} main\n" &&\
     echo $llvmRepository >> /etc/apt/sources.list && \
     curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
 
 RUN apt-get update && apt-get install -y \
+      util-linux \
       bison \
       binutils-dev \
       cmake \

Dockerfile.ubuntu

@@ -1,4 +1,9 @@
-FROM ubuntu:bionic
+ARG OS_TAG=18.04
+FROM ubuntu:${OS_TAG} as builder
+
+ARG OS_TAG
+ARG BUILD_TYPE=release
+ARG DEBIAN_FRONTEND=noninteractive
 
 MAINTAINER Brenden Blanco <bblanco@gmail.com>
 
@@ -10,4 +15,13 @@ COPY ./ /root/bcc
 WORKDIR /root/bcc
 
 RUN /usr/lib/pbuilder/pbuilder-satisfydepends && \
-    ./scripts/build-deb.sh
+    ./scripts/build-deb.sh ${BUILD_TYPE}
+
+FROM ubuntu:${OS_TAG}
+
+COPY --from=builder /root/bcc/*.deb /root/bcc/
+
+RUN \
+  apt-get update -y && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y python python3 binutils libelf1 kmod && \
+  dpkg -i /root/bcc/*.deb