Merge pull request #1 from iovisor/master

updating my local repo

.clang-format

+---
+BasedOnStyle: Google
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+IndentCaseLabels: false
+AccessModifierOffset: -2

.gitignore

+# Editor's files
 *.swp
 *.swo
 *.pyc
+
+# Build artefacts
+/build/

CMakeLists.txt

@@ -9,10 +9,9 @@ enable_testing()
 
 include(cmake/GetGitRevisionDescription.cmake)
 include(cmake/version.cmake)
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-if(LIB64)
-  set(LIBSUFFIX 64)
-endif()
+include(GNUInstallDirs)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 if(NOT PYTHON_ONLY)
 find_package(BISON)
@@ -42,10 +41,33 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS})
   include_directories("${DIR}/../tools/clang/include")
 ENDFOREACH()
 
-set(CMAKE_C_FLAGS "-Wall")
-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
+# Set to a string path if system places kernel lib directory in
+# non-default location.
+if(NOT DEFINED BCC_KERNEL_MODULES_DIR)
+  set(BCC_KERNEL_MODULES_DIR "/lib/modules")
+endif()
+
+find_package(LibElf REQUIRED)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+
+# As reported in issue #735, GCC 6 has some behavioral problems when
+# dealing with -isystem. Hence, skip the warning optimization
+# altogether on that compiler.
+execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+if (GCC_VERSION VERSION_LESS 6.0)
+  # iterate over all available directories in LLVM_INCLUDE_DIRS to
+  # generate a correctly tokenized list of parameters
+  foreach(ONE_LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIRS})
+    set(CXX_ISYSTEM_DIRS "${CXX_ISYSTEM_DIRS} -isystem ${ONE_LLVM_INCLUDE_DIR}")
+  endforeach()
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall ${CXX_ISYSTEM_DIRS}")
 endif()
 
 add_subdirectory(examples)
+add_subdirectory(man)
 add_subdirectory(src)
 add_subdirectory(tests)
+add_subdirectory(tools)

CONTRIBUTING-SCRIPTS.md

+# Contributing bcc/eBPF scripts
+
+If you want to contribute scripts to bcc, or improve your own bcc programs, great! Please read this first.
+
+_(Written by Brendan Gregg.)_
+
+## Type of script
+
+bcc has 2 types of scripts, in different directories:
+
+- **/examples**: intended as short examples of bcc & eBPF code. You should focus on keeping it short, neat, and documented (code comments). A submission can just be the example code.
+- **/tools**: intended as production safe performance and troubleshooting tools. You should focus on it being useful, tested, low overhead, documented (incl. all caveats), and easy to use. A submission should involve 4 changes: the tool, a man page, an example file, and an addition to README.md. Follow [my lead](https://github.com/brendangregg/bcc/commit/9fa156273b395cfc5505f0fff5d6b7b1396f7daa), and see the checklist below. These will be run in mission critical environments as root, so if spending hours testing isn't for you, please submit your idea as an issue instead, or chat with us on irc.
+
+More detail for each below.
+
+## Examples
+
+These are grouped into subdirectories (networking, tracing). Your example can either be a Python program with embedded C (eg, tracing/strlen_count.py), or separate Python and C files (eg, tracing/vfsreadlat.*).
+
+As said earlier: keep it short, neat, and documented (code comments).
+
+## Tools
+
+A checklist for bcc tool development:
+
+1. **Research the topic landscape**. Learn the existing tools and metrics (incl. from /proc). Determine what real world problems exist and need solving. We have too many tools and metrics as it is, we don't need more "I guess that's useful" tools, we need more "ah-hah! I couldn't do this before!" tools. Consider asking other developers about your idea. Many of us can be found in IRC, in the #iovisor channel on irc.oftc.net. There's also the mailing list (see the README.md), and github for issues.
+1. **Create a known workload for testing**. This might involving writing a 10 line C program, using a micro-benchmark, or just improvising at the shell. If you don't know how to create a workload, learn! Figuring this out will provide invaluable context and details that you may have otherwise overlooked. Sometimes it's easy, and I'm able to just use dd(1) from /dev/urandom or a disk device to /dev/null. It lets me set the I/O size, count, and provides throughput statistics for cross-checking my tool output. But other times I need a micro-benchmark, or some C.
+1. **Write the tool to solve the problem and no more**. Unix philosophy: do one thing and do it well. netstat doesn't have an option to dump packets, tcpdump-style. They are two different tools.
+1. **Check your tool correctly measures your known workload**. If possible, run a prime number of events (eg, 23) and check that the numbers match. Try other workload variations.
+1. **Use other observability tools to perform a cross-check or sanity check**. Eg, imagine you write a PCI bus tool that shows current throughput is 28 Gbytes/sec. How could you sanity test that? Well, what PCI devices are there? Disks and network cards? Measure their throughput (iostat, nicstat, sar), and check if is in the ballpark of 28 Gbytes/sec (which would include PCI frame overheads). Ideally, your numbers match.
+1. **Measure the overhead of the tool**. If you are running a micro-benchmark, how much slower is it with the tool running. Is more CPU consumed? Try to determine the worst case: run the micro-benchmark so that CPU headroom is exhausted, and then run the bcc tool. Can overhead be lowered?
+1. **Test again, and stress test**. You want to discover and fix all the bad things before others hit them.
+1. **Consider command line options**. Should it have -p for filtering on a PID? -T for timestamps? -i for interval? See other tools for examples, and copy the style: the usage message should list example usage at the end. Remember to keep the tool doing one thing and doing it well. Also, if there's one option that seems to be the common case, perhaps it should just be the first argument and not need a switch (no -X). A special case of this is *stat tools, like iostat/vmstat/etc, where the convention is [interval [count]].
+1. **Concise, intuitive, self-explanatory output**. The default output should meet the common need concisely. Leave much less useful fields and data to be shown with options: -v for verbose, etc. Consider including a startup message that's self-explanatory, eg "Tracing block I/O. Output every 1 seconds. Ctrl-C to end.". Also, try hard to keep the output less than 80 characters wide, especially the default output of the tool. That way, the output not only fits on the smallest reasonable terminal, it also fits well in slide decks, blog posts, articles, and printed material, all of which help education and adoption. Publishers of technical books often have templates they require books to conform to: it may not be an option to shrink or narrow the font to fit your output.
+1. **Use pep8 to check Python style**: pep8 --show-source --ignore=E123,E125,E126,E127,E128,E302 filename . Note that it misses some things, like consistent usage, so you'll still need to double check your script.
+1. **Write an _example.txt file**. Copy the style in tools/biolatency_example.txt: start with an intro sentence, then have examples, and finish with the USAGE message. Explain everything: the first example should explain what we are seeing, even if this seems obvious. For some people it won't be obvious. Also explain why we are running the tool: what problems it's solving. It can take a long time (hours) to come up with good examples, but it's worth it. These will get copied around (eg, presentations, articles).
+1. **Read your example.txt file**. Does this sound too niche or convoluted? Are you spending too much time explaining caveats? These can be hints that perhaps you should fix your tool, or abandon it! Perhaps it better belongs as an /example, and not a tool. I've abandoned many tools at this stage.
+1. **Write a man page**. Either ROFF (.8), markdown (.md), or plain text (.txt): so long as it documents the important sections, particularly columns (fields) and caveats. These go under man/man8. See the other examples. Include a section on overhead, and pull no punches. It's better for end users to know about high overhead beforehand, than to discover it the hard way. Also explain caveats. Don't assume those will be obvious to tool users.
+1. **Read your man page**. For ROFF: nroff -man filename. Like before, this exercise is like saying something out loud. Does it sound too niche or convoluted? Again, hints that you might need to go back and fix things, or abandon it.
+1. **Spell check your documentation**. Use a spell checker like aspell to check your document quality before committing.
+1. **Add an entry to README.md**.
+1. If you made it this far, pull request!

Dockerfile.debian

+FROM debian:jessie
+
+RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv 15CF4D18AF4F7421 && \
+    echo "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main" > /etc/apt/sources.list.d/llvm.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends build-essential fakeroot bison cmake debhelper devscripts flex git libedit-dev python zlib1g-dev libllvm3.8 llvm-3.8-dev libclang-3.8-dev libelf-dev luajit libluajit-5.1-dev && \
+    mkdir -p /usr/share/llvm-3.8 && \
+    ln -s /usr/lib/llvm-3.8/share/llvm/cmake /usr/share/llvm-3.8/cmake
+
+COPY ./ /root/bcc
+
+WORKDIR /root/bcc
+
+RUN ./scripts/build-deb.sh

INSTALL.md

-# Ubuntu - Binary
+# Installing BCC
 
-Install a 4.2+ kernel from http://kernel.ubuntu.com/~kernel-ppa/mainline,
+* [Kernel Configuration](#kernel-configuration)
+* [Packages](#packages)
+  - [Ubuntu](#ubuntu-xenial---binary)
+  - [Fedora](#fedora---binary)
+  - [Arch](#arch---aur)
+  - [Gentoo](#gentoo---portage)
+* [Source](#source)
+  - [Ubuntu](#ubuntu---source)
+  - [Fedora](#fedora---source)
+* [Older Instructions](#older-instructions)
+
+## Kernel Configuration
+
+In general, to use these features, a Linux kernel version 4.1 or newer is
+required. In addition, the kernel should have been compiled with the following
+flags set:
+
+```
+CONFIG_BPF=y
+CONFIG_BPF_SYSCALL=y
+# [optional, for tc filters]
+CONFIG_NET_CLS_BPF=m
+# [optional, for tc actions]
+CONFIG_NET_ACT_BPF=m
+CONFIG_BPF_JIT=y
+CONFIG_HAVE_BPF_JIT=y
+# [optional, for kprobes]
+CONFIG_BPF_EVENTS=y
+```
+
+Kernel compile flags can usually be checked by looking at `/proc/config.gz` or
+`/boot/config-<kernel-version>`.
+
+# Packages
+
+## Ubuntu Xenial - Binary
+
+Only the nightly packages are built for Ubuntu 16.04, but the steps are very straightforward. No need to upgrade the kernel or compile from source!
+
+```bash
+echo "deb [trusted=yes] https://repo.iovisor.org/apt/xenial xenial-nightly main" | sudo tee /etc/apt/sources.list.d/iovisor.list
+sudo apt-get update
+sudo apt-get install bcc-tools
+```
+
+## Ubuntu Trusty - Binary
+
+**Kernel**
+
+Install a 4.3+ kernel from http://kernel.ubuntu.com/~kernel-ppa/mainline,
 for example:
 
 ```bash
-VER=4.2.0-999
-REL=201509072200
-PREFIX=http://kernel.ubuntu.com/~kernel-ppa/mainline/daily/2015-09-08-unstable/
+VER=4.5.1-040501
+PREFIX=http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.5.1-wily/
+REL=201604121331
 wget ${PREFIX}/linux-headers-${VER}-generic_${VER}.${REL}_amd64.deb
 wget ${PREFIX}/linux-headers-${VER}_${VER}.${REL}_all.deb
 wget ${PREFIX}/linux-image-${VER}-generic_${VER}.${REL}_amd64.deb
@@ -14,20 +63,34 @@ sudo dpkg -i linux-*${VER}.${REL}*.deb
 # reboot
 ```
 
-Tagged bcc binary packages are built for Ubuntu Trusty (14.04) and hosted at
-http://52.8.15.63/apt/.
+Update PREFIX to the latest date, and you can browse the files in the PREFIX url to find the REL number.
+
+**Signed Packages**
+
+Tagged and signed bcc binary packages are built for Ubuntu Trusty (14.04) and
+hosted at https://repo.iovisor.org/apt/.
 
 To install:
 ```bash
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D4284CDD
-echo "deb http://52.8.15.63/apt trusty main" | sudo tee /etc/apt/sources.list.d/iovisor.list
+echo "deb https://repo.iovisor.org/apt trusty main" | sudo tee /etc/apt/sources.list.d/iovisor.list
 sudo apt-get update
-sudo apt-get install libbcc libbcc-examples python-bcc
+sudo apt-get install binutils bcc bcc-tools libbcc-examples python-bcc
+```
+
+**Nightly Packages**
+
+```bash
+echo "deb [trusted=yes] https://repo.iovisor.org/apt/trusty trusty-nightly main" | sudo tee /etc/apt/sources.list.d/iovisor.list
+sudo apt-get update
+sudo apt-get install bcc-tools libbcc-examples
 ```
 
 Test it:
-`sudo python /usr/share/bcc/examples/hello_world.py`
-`sudo python /usr/share/bcc/examples/task_switch.py`
+```
+sudo python /usr/share/bcc/examples/hello_world.py
+sudo python /usr/share/bcc/examples/tracing/task_switch.py
+```
 
 (Optional) Install pyroute2 for additional networking features
 ```bash
@@ -36,63 +99,141 @@ cd pyroute2; sudo make install
 sudo python /usr/share/bcc/examples/simple_tc.py
 ```
 
-# Fedora - Binary
+## Fedora - Binary
 
 Install a 4.2+ kernel from
 http://alt.fedoraproject.org/pub/alt/rawhide-kernel-nodebug, for example:
 
 ```bash
-sudo wget http://alt.fedoraproject.org/pub/alt/rawhide-kernel-nodebug/fedora-rawhide-kernel-nodebug.repo -O /etc/yum.repos.d/fedora-rawhide-kernel-nodebug.repo
-sudo dnf install -y kernel-core-4.2.0-1.fc24.x86_64 kernel-4.2.0-1.fc24.x86_64 kernel-devel-4.2.0-1.fc24.x86_64 kernel-modules-4.2.0-1.fc24.x86_64 kernel-headers-4.2.0-1.fc24.x86_64
+sudo dnf config-manager --add-repo=http://alt.fedoraproject.org/pub/alt/rawhide-kernel-nodebug/fedora-rawhide-kernel-nodebug.repo
+sudo dnf update
 # reboot
 ```
 
-Tagged bcc binary packages are built for Fedora 22 and hosted at
-http://52.8.15.63/yum/.
+Nightly bcc binary packages are built for Fedora 23 and 24, hosted at
+`https://repo.iovisor.org/yum/nightly/f{23,24}`.
 
-To install:
+To install (change 'f23' to 'f24' for rawhide):
 ```bash
-sudo wget http://52.8.15.63/yum/main/f22/iovisor.repo -O /etc/yum.repos.d/iovisor.repo
-sudo dnf install -y libbcc libbcc-examples python-bcc
+echo -e '[iovisor]\nbaseurl=https://repo.iovisor.org/yum/nightly/f23/$basearch\nenabled=1\ngpgcheck=0' | sudo tee /etc/yum.repos.d/iovisor.repo
+sudo dnf install bcc-tools
 ```
 
-# Ubuntu - From source
+## Arch - AUR
+
+Upgrade the kernel to minimum 4.3.1-1 first; the ```CONFIG_BPF_SYSCALL=y``` configuration was not added until [this kernel release](https://bugs.archlinux.org/task/47008).
+
+Install these packages using any AUR helper such as [pacaur](https://aur.archlinux.org/packages/pacaur), [yaourt](https://aur.archlinux.org/packages/yaourt), [cower](https://aur.archlinux.org/packages/cower), etc.:
+```
+bcc bcc-tools python-bcc python2-bcc
+```
+All build and install dependencies are listed [in the PKGBUILD](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=bcc) and should install automatically.
+
+## Gentoo - Portage
+
+First of all, upgrade the kernel of your choice to a recent version. For example:
+```
+emerge sys-kernel/gentoo-sources
+```
+Then, configure the kernel enabling the features you need. Please consider the following as a starting point:
+```
+CONFIG_BPF=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_BPF_JIT=y
+CONFIG_BPF_EVENTS=y
+```
+Finally, you can install bcc with:
+```
+emerge dev-util/bcc
+```
+The appropriate dependencies (e.g., ```clang```, ```llvm``` with BPF backend) will be pulled automatically.
+
+
+# Source
+
+## Ubuntu - Source
 
 To build the toolchain from source, one needs:
-* LLVM 3.7 or newer, compiled with BPF support (default=on)
-* Clang 3.7, built from the same tree as LLVM
+* LLVM 3.7.1 or newer, compiled with BPF support (default=on)
+* Clang, built from the same tree as LLVM
 * cmake, gcc (>=4.7), flex, bison
+* LuaJIT, if you want Lua support
+
+### Install build dependencies
+```
+# Trusty and older
+VER=trusty
+echo "deb http://llvm.org/apt/$VER/ llvm-toolchain-$VER-3.7 main
+deb-src http://llvm.org/apt/$VER/ llvm-toolchain-$VER-3.7 main" | \
+  sudo tee /etc/apt/sources.list.d/llvm.list
+wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+sudo apt-get update
+
+# All versions
+sudo apt-get -y install bison build-essential cmake flex git libedit-dev \
+  libllvm3.7 llvm-3.7-dev libclang-3.7-dev python zlib1g-dev libelf-dev
+
+# For Lua support
+sudo apt-get -y install luajit luajit-5.1-dev
+```
+
+### Install and compile BCC
+```
+git clone https://github.com/iovisor/bcc.git
+mkdir bcc/build; cd bcc/build
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+make
+sudo make install
+```
+
+## Fedora - Source
 
-* Install build dependencies
-  * `sudo apt-get -y install bison build-essential cmake flex git libedit-dev python zlib1g-dev`
-* Build LLVM and Clang development libs
-  * `git clone http://llvm.org/git/llvm.git`
-  * `cd llvm/tools; git clone http://llvm.org/git/clang.git`
-  * `cd ..; mkdir -p build/install; cd build`
-  * `cmake -G "Unix Makefiles" -DLLVM_TARGETS_TO_BUILD="BPF;X86" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install ..`
-  * `make -j4`
-  * `make install`
-  * `export PATH=$PWD/install/bin:$PATH`
-* Install and compile BCC
-  * `git clone https://github.com/iovisor/bcc.git`
-  * `mkdir bcc/build; cd bcc/build`
-  * `cmake .. -DCMAKE_INSTALL_PREFIX=/usr`
-  * `make`
-  * `sudo make install`
-
-# Fedora - From source
-
-* Install build dependencies
-  * `sudo dnf install -y bison cmake ethtool flex git iperf libstdc++-static python-netaddr python-pip gcc gcc-c++ make zlib-devel`
-  * `sudo dnf install -y http://pkgs.repoforge.org/netperf/netperf-2.6.0-1.el6.rf.x86_64.rpm`
-  * `sudo pip install pyroute2`
-* Install binary clang
-  * `wget http://llvm.org/releases/3.7.0/clang+llvm-3.7.0-x86_64-fedora22.tar.xz`
-  * `sudo tar xf clang+llvm-3.7.0-x86_64-fedora22.tar.xz -C /usr/local --strip 1`
-* Install and compile BCC
-  * `git clone https://github.com/iovisor/bcc.git`
-  * `mkdir bcc/build; cd bcc/build`
-  * [optional] `export CC=/usr/local/bin/clang CXX=/usr/local/bin/clang++`
-  * `cmake .. -DCMAKE_INSTALL_PREFIX=/usr`
-  * `make`
-  * `sudo make install`
+### Install build dependencies
+
+```
+sudo dnf install -y bison cmake ethtool flex git iperf libstdc++-static \
+  python-netaddr python-pip gcc gcc-c++ make zlib-devel \
+  elfutils-libelf-devel
+sudo dnf install -y luajit luajit-devel  # for Lua support
+sudo dnf install -y \
+  http://pkgs.repoforge.org/netperf/netperf-2.6.0-1.el6.rf.x86_64.rpm
+sudo pip install pyroute2
+```
+
+### Install binary clang
+
+```
+# FC22
+wget http://llvm.org/releases/3.7.1/clang+llvm-3.7.1-x86_64-fedora22.tar.xz
+sudo tar xf clang+llvm-3.7.1-x86_64-fedora22.tar.xz -C /usr/local --strip 1
+
+# FC23 and FC24
+wget http://llvm.org/releases/3.9.0/clang+llvm-3.9.0-x86_64-fedora23.tar.xz
+sudo tar xf clang+llvm-3.9.0-x86_64-fedora23.tar.xz -C /usr/local --strip 1
+```
+
+### Install and compile BCC
+```
+git clone https://github.com/iovisor/bcc.git
+mkdir bcc/build; cd bcc/build
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+make
+sudo make install
+```
+
+# Older Instructions
+
+## Build LLVM and Clang development libs
+
+```
+git clone http://llvm.org/git/llvm.git
+cd llvm/tools; git clone http://llvm.org/git/clang.git
+cd ..; mkdir -p build/install; cd build
+cmake -G "Unix Makefiles" -DLLVM_TARGETS_TO_BUILD="BPF;X86" \
+  -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install ..
+make
+make install
+export PATH=$PWD/install/bin:$PATH
+```

SPECS/Dockerfile.el6

-# Copyright (c) PLUMgrid, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License")
-
-FROM centos:6
-
-MAINTAINER Brenden Blanco <bblanco@plumgrid.com>
-
-RUN yum -y install bison cmake flex gcc gcc-c++ git glibc-devel glibc-utils python2-devel rpm-build svn tar texinfo-tex wget zip zlib-devel
-
-WORKDIR /root
-RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-RUN cd SOURCES && wget https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
-RUN cd SOURCES && wget https://ftp.gnu.org/gnu/gcc/gcc-5.1.0/gcc-5.1.0.tar.gz
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz
-RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.6.tar.gz
-
-RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.6/SPECS/bcc.el6.spec
-#COPY SPECS/bcc.el6.spec SPECS/
-
-RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.el6.spec

SPECS/Dockerfile.el6.in

-# Copyright (c) PLUMgrid, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License")
-
-FROM centos:6
-
-MAINTAINER Brenden Blanco <bblanco@plumgrid.com>
-
-RUN yum -y install bison cmake flex gcc gcc-c++ git glibc-devel glibc-utils python2-devel rpm-build svn tar texinfo-tex wget zip zlib-devel
-
-WORKDIR /root
-RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-RUN cd SOURCES && wget https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
-RUN cd SOURCES && wget https://ftp.gnu.org/gnu/gcc/gcc-5.1.0/gcc-5.1.0.tar.gz
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz
-RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v@REVISION_LAST@.tar.gz
-
-RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v@REVISION_LAST@/SPECS/bcc.el6.spec
-#COPY SPECS/bcc.el6.spec SPECS/
-
-RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.el6.spec

SPECS/Dockerfile.el7

-# Copyright (c) PLUMgrid, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License")
-
-FROM centos:7
-
-MAINTAINER Brenden Blanco <bblanco@plumgrid.com>
-
-RUN yum -y install bison cmake flex gcc gcc-c++ make python2-devel rpm-build wget zlib-devel
-
-WORKDIR /root
-RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz
-RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.6.tar.gz
-
-RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.6/SPECS/bcc.el7.spec
-#COPY SPECS/bcc.el7.spec SPECS/
-
-RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.el7.spec

SPECS/Dockerfile.el7.in

-# Copyright (c) PLUMgrid, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License")
-
-FROM centos:7
-
-MAINTAINER Brenden Blanco <bblanco@plumgrid.com>
-
-RUN yum -y install bison cmake flex gcc gcc-c++ make python2-devel rpm-build wget zlib-devel
-
-WORKDIR /root
-RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz
-RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v@REVISION_LAST@.tar.gz
-
-RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v@REVISION_LAST@/SPECS/bcc.el7.spec
-#COPY SPECS/bcc.el7.spec SPECS/
-
-RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.el7.spec

SPECS/Dockerfile.f22

-# Copyright (c) PLUMgrid, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License")
-
-FROM fedora:22
-
-MAINTAINER Brenden Blanco <bblanco@plumgrid.com>
-
-RUN dnf -y install bison cmake flex gcc gcc-c++ libstdc++-static make python2-devel rpm-build wget zlib-devel
-
-WORKDIR /root
-RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz
-RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.6.tar.gz
-
-RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.6/SPECS/bcc.f22.spec
-#COPY SPECS/bcc.f22.spec SPECS/
-
-RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.f22.spec

SPECS/Dockerfile.f22.in

-# Copyright (c) PLUMgrid, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License")
-
-FROM fedora:22
-
-MAINTAINER Brenden Blanco <bblanco@plumgrid.com>
-
-RUN dnf -y install bison cmake flex gcc gcc-c++ libstdc++-static make python2-devel rpm-build wget zlib-devel
-
-WORKDIR /root
-RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz
-RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz
-RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v@REVISION_LAST@.tar.gz
-
-RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v@REVISION_LAST@/SPECS/bcc.f22.spec
-#COPY SPECS/bcc.f22.spec SPECS/
-
-RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.f22.spec

SPECS/Dockerfile.fedora

+# Copyright (c) PLUMgrid, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License")
+
+FROM fedora:rawhide
+
+MAINTAINER Brenden Blanco <bblanco@plumgrid.com>
+
+RUN dnf -y install bison cmake flex gcc gcc-c++ git libxml2-devel make python2-devel rpm-build wget zlib-devel
+
+WORKDIR /root
+
+RUN wget http://llvm.org/releases/3.7.1/{cfe,llvm}-3.7.1.src.tar.xz
+
+RUN tar -xf llvm-3.7.1.src.tar.xz && mkdir llvm-3.7.1.src/tools/clang && tar -xf cfe-3.7.1.src.tar.xz -C llvm-3.7.1.src/tools/clang --strip 1 && mkdir llvm-3.7.1.src/build
+RUN cd llvm-3.7.1.src/build && cmake .. -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86;BPF" -DCMAKE_INSTALL_PREFIX=/usr
+RUN cd llvm-3.7.1.src/build && make -j8
+
+COPY . bcc
+WORKDIR /root/bcc
+RUN PATH=/root/llvm-3.7.1.src/build/bin:$PATH ./scripts/build-rpm.sh

SPECS/bcc.el7.spec → SPECS/bcc+clang.spec

 %define debug_package %{nil}
-%define llvmver 3.7.0
+%define llvmver 3.7.1
 
 Name:           bcc
-Version:        0.1.6
-Release:        1%{?dist}
+Version:        @REVISION@
+Release:        @GIT_REV_COUNT@
 Summary:        BPF Compiler Collection (BCC)
 
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            https://github.com/iovisor/bcc
 Source0:        https://github.com/iovisor/bcc/archive/v%{version}.tar.gz
-Source1:        http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz
-Source2:        http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz
+Source1:        http://llvm.org/releases/%{llvmver}/llvm-%{llvmver}.src.tar.xz
+Source2:        http://llvm.org/releases/%{llvmver}/cfe-%{llvmver}.src.tar.xz
 
 BuildArch:      x86_64
-BuildRequires:  bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel
+BuildRequires:  bison, cmake >= 2.8.7, flex, gcc, gcc-c++, libxml2-devel, python2-devel, elfutils-libelf-devel-static
 
 %description
 Python bindings for BPF Compiler Collection (BCC). Control a BPF program from
@@ -25,7 +25,7 @@ userspace.
 %setup -T -b 1 -n llvm-%{llvmver}.src
 mkdir tools/clang
 tar -xvvJf %{_sourcedir}/cfe-%{llvmver}.src.tar.xz -C tools/clang --strip 1
-%setup -D -n bcc-%{version}
+%setup -D -n bcc
 
 %build
 
@@ -36,15 +36,15 @@ export PATH="%{_builddir}/usr/bin":$PATH
 pushd %{_builddir}/llvm-%{llvmver}.src
 mkdir build
 cd build
-../configure --disable-assertions --enable-optimized --prefix="%{_builddir}/usr"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
+cmake .. -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86;BPF" -DCMAKE_INSTALL_PREFIX=/usr
+make %{?_smp_mflags}
+make install DESTDIR="%{_builddir}"
 popd
 
 mkdir build
 pushd build
-cmake .. -DREVISION=%{version} -DCMAKE_INSTALL_PREFIX=/usr
-make -j`grep -c ^process /proc/cpuinfo`
+cmake .. -DREVISION_LAST=%{version} -DREVISION=%{version} -DCMAKE_INSTALL_PREFIX=/usr
+make %{?_smp_mflags}
 popd
 
 %install
@@ -57,28 +57,44 @@ make install/strip DESTDIR=%{buildroot}
 
 %package -n libbcc
 Summary: Shared Library for BPF Compiler Collection (BCC)
-Requires: make, gcc
+Requires: elfutils-libelf
 %description -n libbcc
 Shared Library for BPF Compiler Collection (BCC)
 
 %package -n libbcc-examples
 Summary: Examples for BPF Compiler Collection (BCC)
+Requires: libbcc
 %description -n libbcc-examples
 Examples for BPF Compiler Collection (BCC)
 
 %package -n python-bcc
 Summary: Python bindings for BPF Compiler Collection (BCC)
+Requires: libbcc
 %description -n python-bcc
 Python bindings for BPF Compiler Collection (BCC)
 
+%package -n bcc-tools
+Summary: Command line tools for BPF Compiler Collection (BCC)
+Requires: python-bcc
+%description -n bcc-tools
+Command line tools for BPF Compiler Collection (BCC)
+
 %files -n python-bcc
 %{python_sitelib}/bcc*
-%exclude %{python_sitelib}/*.egg-info
 
 %files -n libbcc
 /usr/lib64/*
-/usr/share/bcc/include/*
 /usr/include/bcc/*
 
 %files -n libbcc-examples
 /usr/share/bcc/examples/*
+%exclude /usr/share/bcc/examples/*.pyc
+%exclude /usr/share/bcc/examples/*.pyo
+%exclude /usr/share/bcc/examples/*/*.pyc
+%exclude /usr/share/bcc/examples/*/*.pyo
+%exclude /usr/share/bcc/examples/*/*/*.pyc
+%exclude /usr/share/bcc/examples/*/*/*.pyo
+
+%files -n bcc-tools
+/usr/share/bcc/tools/*
+/usr/share/bcc/man/*

SPECS/bcc.el6.spec

-# Copyright (c) PLUMgrid, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License")
-
-%define debug_package %{nil}
-%define llvmver 3.7.0
-%define gccver 5.1.0
-%define pythonver 2.7.10
-
-Name:           bcc
-Version:        0.1.6
-Release:        1%{?dist}
-Summary:        BPF Compiler Collection (BCC)
-
-Group:          Development/Languages
-License:        ASL 2.0
-URL:            https://github.com/iovisor/bcc
-Source0:        https://github.com/iovisor/bcc/archive/v%{version}.tar.gz
-Source1:        https://ftp.gnu.org/gnu/gcc/gcc-%{gccver}/gcc-%{gccver}.tar.gz
-Source2:        https://www.python.org/ftp/python/%{pythonver}/Python-%{pythonver}.tgz
-Source3:        http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz
-Source4:        http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz
-
-BuildArch:      x86_64
-BuildRequires:  bison, bzip2, cmake >= 2.8.7, file, flex, gcc, gcc-c++, git, glibc-devel, glibc-utils, python2-devel, rpm-build, svn, tar, texinfo-tex, wget, zip, zlib-devel
-
-%description
-Python bindings for BPF Compiler Collection (BCC). Control a BPF program
-from userspace.
-
-
-%prep
-%setup -T -b 1 -n gcc-%{gccver}
-%setup -T -D -b 2 -n Python-%{pythonver}
-%setup -T -D -b 3 -n llvm-%{llvmver}.src
-mkdir tools/clang
-tar -xvvJf %{_sourcedir}/cfe-%{llvmver}.src.tar.xz -C tools/clang --strip 1
-%setup -D -n bcc-%{version}
-
-%build
-
-export LD_LIBRARY_PATH="%{_builddir}/usr/lib64"
-export PATH="%{_builddir}/usr/bin":$PATH
-
-# build gcc to bootstrap llvm build
-pushd %{_builddir}/gcc-%{gccver}
-./contrib/download_prerequisites
-mkdir build
-cd build
-../configure --disable-multilib --prefix="%{_builddir}/usr"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-echo "%{_builddir}/usr/lib64" > /etc/ld.so.conf.d/usrLocalLib64.conf
-ldconfig
-
-# build newer python for llvm
-pushd %{_builddir}/Python-%{pythonver}
-./configure --prefix="%{_builddir}/usr"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-# build llvm with local gcc
-pushd %{_builddir}/llvm-%{llvmver}.src
-mkdir build
-cd build
-cmake .. -DCMAKE_INSTALL_PREFIX="%{_builddir}/usr" -DCMAKE_C_COMPILER="%{_builddir}/usr/bin/gcc" -DCMAKE_CXX_COMPILER="%{_builddir}/usr/bin/g++" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86;BPF"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-rm /etc/ld.so.conf.d/usrLocalLib64.conf
-ldconfig
-
-mkdir build
-cd build
-cmake .. -DREVISION=%{version} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_COMPILER="%{_builddir}/usr/bin/gcc" -DCMAKE_CXX_COMPILER="%{_builddir}/usr/bin/g++"
-make -j`grep -c ^process /proc/cpuinfo`
-
-%install
-cd build
-make install/strip DESTDIR=%{buildroot}
-
-%changelog
-* Fri Jul 03 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.1-2
-- Initial RPM Release
-
-%package -n libbcc
-Summary: Shared Library for BPF Compiler Collection (BCC)
-Requires: make, gcc
-%description -n libbcc
-Shared Library for BPF Compiler Collection (BCC)
-
-%package -n libbcc-examples
-Summary: Examples for BPF Compiler Collection (BCC)
-%description -n libbcc-examples
-Examples for BPF Compiler Collection (BCC)
-
-%package -n python-bcc
-Summary: Python bindings for BPF Compiler Collection (BCC)
-%description -n python-bcc
-Python bindings for BPF Compiler Collection (BCC)
-
-%files -n python-bcc
-%{python_sitelib}/bcc*
-%exclude %{python_sitelib}/*.egg-info
-
-%files -n libbcc
-/usr/lib64/*
-/usr/share/bcc/include/*
-/usr/include/bcc/*
-
-%files -n libbcc-examples
-/usr/share/bcc/examples/*

SPECS/bcc.el6.spec.in

-# Copyright (c) PLUMgrid, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License")
-
-%define debug_package %{nil}
-%define llvmver 3.7.0
-%define gccver 5.1.0
-%define pythonver 2.7.10
-
-Name:           bcc
-Version:        @REVISION_LAST@
-Release:        1%{?dist}
-Summary:        BPF Compiler Collection (BCC)
-
-Group:          Development/Languages
-License:        ASL 2.0
-URL:            https://github.com/iovisor/bcc
-Source0:        https://github.com/iovisor/bcc/archive/v%{version}.tar.gz
-Source1:        https://ftp.gnu.org/gnu/gcc/gcc-%{gccver}/gcc-%{gccver}.tar.gz
-Source2:        https://www.python.org/ftp/python/%{pythonver}/Python-%{pythonver}.tgz
-Source3:        http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz
-Source4:        http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz
-
-BuildArch:      x86_64
-BuildRequires:  bison, bzip2, cmake >= 2.8.7, file, flex, gcc, gcc-c++, git, glibc-devel, glibc-utils, python2-devel, rpm-build, svn, tar, texinfo-tex, wget, zip, zlib-devel
-
-%description
-Python bindings for BPF Compiler Collection (BCC). Control a BPF program
-from userspace.
-
-
-%prep
-%setup -T -b 1 -n gcc-%{gccver}
-%setup -T -D -b 2 -n Python-%{pythonver}
-%setup -T -D -b 3 -n llvm-%{llvmver}.src
-mkdir tools/clang
-tar -xvvJf %{_sourcedir}/cfe-%{llvmver}.src.tar.xz -C tools/clang --strip 1
-%setup -D -n bcc-%{version}
-
-%build
-
-export LD_LIBRARY_PATH="%{_builddir}/usr/lib64"
-export PATH="%{_builddir}/usr/bin":$PATH
-
-# build gcc to bootstrap llvm build
-pushd %{_builddir}/gcc-%{gccver}
-./contrib/download_prerequisites
-mkdir build
-cd build
-../configure --disable-multilib --prefix="%{_builddir}/usr"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-echo "%{_builddir}/usr/lib64" > /etc/ld.so.conf.d/usrLocalLib64.conf
-ldconfig
-
-# build newer python for llvm
-pushd %{_builddir}/Python-%{pythonver}
-./configure --prefix="%{_builddir}/usr"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-# build llvm with local gcc
-pushd %{_builddir}/llvm-%{llvmver}.src
-mkdir build
-cd build
-cmake .. -DCMAKE_INSTALL_PREFIX="%{_builddir}/usr" -DCMAKE_C_COMPILER="%{_builddir}/usr/bin/gcc" -DCMAKE_CXX_COMPILER="%{_builddir}/usr/bin/g++" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86;BPF"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-rm /etc/ld.so.conf.d/usrLocalLib64.conf
-ldconfig
-
-mkdir build
-cd build
-cmake .. -DREVISION=%{version} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_COMPILER="%{_builddir}/usr/bin/gcc" -DCMAKE_CXX_COMPILER="%{_builddir}/usr/bin/g++"
-make -j`grep -c ^process /proc/cpuinfo`
-
-%install
-cd build
-make install/strip DESTDIR=%{buildroot}
-
-%changelog
-* Fri Jul 03 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.1-2
-- Initial RPM Release
-
-%package -n libbcc
-Summary: Shared Library for BPF Compiler Collection (BCC)
-Requires: make, gcc
-%description -n libbcc
-Shared Library for BPF Compiler Collection (BCC)
-
-%package -n libbcc-examples
-Summary: Examples for BPF Compiler Collection (BCC)
-%description -n libbcc-examples
-Examples for BPF Compiler Collection (BCC)
-
-%package -n python-bcc
-Summary: Python bindings for BPF Compiler Collection (BCC)
-%description -n python-bcc
-Python bindings for BPF Compiler Collection (BCC)
-
-%files -n python-bcc
-%{python_sitelib}/bcc*
-%exclude %{python_sitelib}/*.egg-info
-
-%files -n libbcc
-/usr/lib64/*
-/usr/share/bcc/include/*
-/usr/include/bcc/*
-
-%files -n libbcc-examples
-/usr/share/bcc/examples/*

SPECS/bcc.el7.spec.in

-%define debug_package %{nil}
-%define llvmver 3.7.0
-
-Name:           bcc
-Version:        @REVISION_LAST@
-Release:        1%{?dist}
-Summary:        BPF Compiler Collection (BCC)
-
-Group:          Development/Languages
-License:        ASL 2.0
-URL:            https://github.com/iovisor/bcc
-Source0:        https://github.com/iovisor/bcc/archive/v%{version}.tar.gz
-Source1:        http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz
-Source2:        http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz
-
-BuildArch:      x86_64
-BuildRequires:  bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel
-
-%description
-Python bindings for BPF Compiler Collection (BCC). Control a BPF program from
-userspace.
-
-
-%prep
-%setup -T -b 1 -n llvm-%{llvmver}.src
-mkdir tools/clang
-tar -xvvJf %{_sourcedir}/cfe-%{llvmver}.src.tar.xz -C tools/clang --strip 1
-%setup -D -n bcc-%{version}
-
-%build
-
-export LD_LIBRARY_PATH="%{_builddir}/usr/lib64"
-export PATH="%{_builddir}/usr/bin":$PATH
-
-# build llvm
-pushd %{_builddir}/llvm-%{llvmver}.src
-mkdir build
-cd build
-../configure --disable-assertions --enable-optimized --prefix="%{_builddir}/usr"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-mkdir build
-pushd build
-cmake .. -DREVISION=%{version} -DCMAKE_INSTALL_PREFIX=/usr
-make -j`grep -c ^process /proc/cpuinfo`
-popd
-
-%install
-pushd build
-make install/strip DESTDIR=%{buildroot}
-
-%changelog
-* Fri Jul 03 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.1-2
-- Initial RPM Release
-
-%package -n libbcc
-Summary: Shared Library for BPF Compiler Collection (BCC)
-Requires: make, gcc
-%description -n libbcc
-Shared Library for BPF Compiler Collection (BCC)
-
-%package -n libbcc-examples
-Summary: Examples for BPF Compiler Collection (BCC)
-%description -n libbcc-examples
-Examples for BPF Compiler Collection (BCC)
-
-%package -n python-bcc
-Summary: Python bindings for BPF Compiler Collection (BCC)
-%description -n python-bcc
-Python bindings for BPF Compiler Collection (BCC)
-
-%files -n python-bcc
-%{python_sitelib}/bcc*
-%exclude %{python_sitelib}/*.egg-info
-
-%files -n libbcc
-/usr/lib64/*
-/usr/share/bcc/include/*
-/usr/include/bcc/*
-
-%files -n libbcc-examples
-/usr/share/bcc/examples/*

SPECS/bcc.f22.spec

-%define debug_package %{nil}
-%define llvmver 3.7.0
-
-Name:           bcc
-Version:        0.1.6
-Release:        1%{?dist}
-Summary:        BPF Compiler Collection (BCC)
-
-Group:          Development/Languages
-License:        ASL 2.0
-URL:            https://github.com/iovisor/bcc
-Source0:        https://github.com/iovisor/bcc/archive/v%{version}.tar.gz
-Source1:        http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz
-Source2:        http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz
-
-BuildArch:      x86_64
-BuildRequires:  bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel
-
-%description
-Python bindings for BPF Compiler Collection (BCC). Control a BPF program from
-userspace.
-
-
-%prep
-%setup -T -b 1 -n llvm-%{llvmver}.src
-mkdir tools/clang
-tar -xvvJf %{_sourcedir}/cfe-%{llvmver}.src.tar.xz -C tools/clang --strip 1
-%setup -D -n bcc-%{version}
-
-%build
-
-export LD_LIBRARY_PATH="%{_builddir}/usr/lib64"
-export PATH="%{_builddir}/usr/bin":$PATH
-
-# build llvm
-pushd %{_builddir}/llvm-%{llvmver}.src
-mkdir build
-cd build
-../configure --disable-assertions --enable-optimized --prefix="%{_builddir}/usr"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-mkdir build
-pushd build
-cmake .. -DREVISION=%{version} -DCMAKE_INSTALL_PREFIX=/usr
-make -j`grep -c ^process /proc/cpuinfo`
-popd
-
-%install
-pushd build
-make install/strip DESTDIR=%{buildroot}
-
-%changelog
-* Fri Jul 03 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.1-2
-- Initial RPM Release
-
-%package -n libbcc
-Summary: Shared Library for BPF Compiler Collection (BCC)
-Requires: make, gcc
-%description -n libbcc
-Shared Library for BPF Compiler Collection (BCC)
-
-%package -n libbcc-examples
-Summary: Examples for BPF Compiler Collection (BCC)
-%description -n libbcc-examples
-Examples for BPF Compiler Collection (BCC)
-
-%package -n python-bcc
-Summary: Python bindings for BPF Compiler Collection (BCC)
-%description -n python-bcc
-Python bindings for BPF Compiler Collection (BCC)
-
-%files -n python-bcc
-%{python_sitelib}/bcc*
-%exclude %{python_sitelib}/*.egg-info
-
-%files -n libbcc
-/usr/lib64/*
-/usr/share/bcc/include/*
-/usr/include/bcc/*
-
-%files -n libbcc-examples
-/usr/share/bcc/examples/*

SPECS/bcc.f22.spec.in

-%define debug_package %{nil}
-%define llvmver 3.7.0
-
-Name:           bcc
-Version:        @REVISION_LAST@
-Release:        1%{?dist}
-Summary:        BPF Compiler Collection (BCC)
-
-Group:          Development/Languages
-License:        ASL 2.0
-URL:            https://github.com/iovisor/bcc
-Source0:        https://github.com/iovisor/bcc/archive/v%{version}.tar.gz
-Source1:        http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz
-Source2:        http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz
-
-BuildArch:      x86_64
-BuildRequires:  bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel
-
-%description
-Python bindings for BPF Compiler Collection (BCC). Control a BPF program from
-userspace.
-
-
-%prep
-%setup -T -b 1 -n llvm-%{llvmver}.src
-mkdir tools/clang
-tar -xvvJf %{_sourcedir}/cfe-%{llvmver}.src.tar.xz -C tools/clang --strip 1
-%setup -D -n bcc-%{version}
-
-%build
-
-export LD_LIBRARY_PATH="%{_builddir}/usr/lib64"
-export PATH="%{_builddir}/usr/bin":$PATH
-
-# build llvm
-pushd %{_builddir}/llvm-%{llvmver}.src
-mkdir build
-cd build
-../configure --disable-assertions --enable-optimized --prefix="%{_builddir}/usr"
-make -j`grep -c ^process /proc/cpuinfo`
-make install
-popd
-
-mkdir build
-pushd build
-cmake .. -DREVISION=%{version} -DCMAKE_INSTALL_PREFIX=/usr
-make -j`grep -c ^process /proc/cpuinfo`
-popd
-
-%install
-pushd build
-make install/strip DESTDIR=%{buildroot}
-
-%changelog
-* Fri Jul 03 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.1-2
-- Initial RPM Release
-
-%package -n libbcc
-Summary: Shared Library for BPF Compiler Collection (BCC)
-Requires: make, gcc
-%description -n libbcc
-Shared Library for BPF Compiler Collection (BCC)
-
-%package -n libbcc-examples
-Summary: Examples for BPF Compiler Collection (BCC)
-%description -n libbcc-examples
-Examples for BPF Compiler Collection (BCC)
-
-%package -n python-bcc
-Summary: Python bindings for BPF Compiler Collection (BCC)
-%description -n python-bcc
-Python bindings for BPF Compiler Collection (BCC)
-
-%files -n python-bcc
-%{python_sitelib}/bcc*
-%exclude %{python_sitelib}/*.egg-info
-
-%files -n libbcc
-/usr/lib64/*
-/usr/share/bcc/include/*
-/usr/include/bcc/*
-
-%files -n libbcc-examples
-/usr/share/bcc/examples/*

SPECS/bcc.spec

+%bcond_with local_clang_static
 %define debug_package %{nil}
 
 Name:           bcc
-Version:        0.1.6
-Release:        1%{?dist}
+Version:        @REVISION@
+Release:        @GIT_REV_COUNT@
 Summary:        BPF Compiler Collection (BCC)
 
 Group:          Development/Languages
@@ -10,8 +11,15 @@ License:        ASL 2.0
 URL:            https://github.com/iovisor/bcc
 Source0:        bcc.tar.gz
 
-BuildArch:      x86_64
-BuildRequires:  bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel
+ExclusiveArch: x86_64
+BuildRequires: bison cmake >= 2.8.7 flex make
+BuildRequires: gcc gcc-c++ python2-devel elfutils-libelf-devel-static
+BuildRequires: luajit luajit-devel
+%if %{without local_clang_static}
+BuildRequires: llvm-devel llvm-static
+BuildRequires: clang-devel
+%endif
+BuildRequires: pkgconfig ncurses-devel
 
 %description
 Python bindings for BPF Compiler Collection (BCC). Control a BPF program from
@@ -19,48 +27,93 @@ userspace.
 
 
 %prep
-%setup -n bcc
+%setup -q -n bcc
 
 %build
 
 mkdir build
 pushd build
-cmake .. -DREVISION=%{version} -DCMAKE_INSTALL_PREFIX=/usr
-make -j`grep -c ^process /proc/cpuinfo`
+cmake .. -DREVISION_LAST=%{version} -DREVISION=%{version} \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DLUAJIT_INCLUDE_DIR=`pkg-config --variable=includedir luajit` \
+      -DLUAJIT_LIBRARIES=`pkg-config --variable=libdir luajit`/lib`pkg-config --variable=libname luajit`.so
+make %{?_smp_mflags}
 popd
 
 %install
 pushd build
 make install/strip DESTDIR=%{buildroot}
 
-%changelog
-* Fri Jul 03 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.1-2
-- Initial RPM Release
-
 %package -n libbcc
 Summary: Shared Library for BPF Compiler Collection (BCC)
-Requires: gcc, make
+Requires: elfutils-libelf
 %description -n libbcc
 Shared Library for BPF Compiler Collection (BCC)
 
-%package -n libbcc-examples
-Summary: Examples for BPF Compiler Collection (BCC)
-%description -n libbcc-examples
-Examples for BPF Compiler Collection (BCC)
-
 %package -n python-bcc
 Summary: Python bindings for BPF Compiler Collection (BCC)
+Requires: libbcc = %{version}-%{release}
 %description -n python-bcc
 Python bindings for BPF Compiler Collection (BCC)
 
-%files -n python-bcc
-%{python_sitelib}/bcc*
-%exclude %{python_sitelib}/*.egg-info
+%package -n bcc-lua
+Summary: Standalone tool to run BCC tracers written in Lua
+Requires: libbcc = %{version}-%{release}
+%description -n bcc-lua
+Standalone tool to run BCC tracers written in Lua
+
+%package -n libbcc-examples
+Summary: Examples for BPF Compiler Collection (BCC)
+Requires: python-bcc = %{version}-%{release}
+Requires: bcc-lua = %{version}-%{release}
+%description -n libbcc-examples
+Examples for BPF Compiler Collection (BCC)
+
+%package -n bcc-tools
+Summary: Command line tools for BPF Compiler Collection (BCC)
+Requires: python-bcc = %{version}-%{release}
+%description -n bcc-tools
+Command line tools for BPF Compiler Collection (BCC)
 
 %files -n libbcc
 /usr/lib64/*
-/usr/share/bcc/include/*
 /usr/include/bcc/*
 
+%files -n python-bcc
+%{python_sitelib}/bcc*
+
+%files -n bcc-lua
+/usr/bin/bcc-lua
+
 %files -n libbcc-examples
 /usr/share/bcc/examples/*
+%exclude /usr/share/bcc/examples/*.pyc
+%exclude /usr/share/bcc/examples/*.pyo
+%exclude /usr/share/bcc/examples/*/*.pyc
+%exclude /usr/share/bcc/examples/*/*.pyo
+%exclude /usr/share/bcc/examples/*/*/*.pyc
+%exclude /usr/share/bcc/examples/*/*/*.pyo
+
+%files -n bcc-tools
+/usr/share/bcc/tools/*
+/usr/share/bcc/man/*
+
+%post -n libbcc -p /sbin/ldconfig
+
+%postun -n libbcc -p /sbin/ldconfig
+
+%changelog
+* Mon Nov 21 2016 William Cohen <wcohen@redhat.com> - 0.2.0-1
+- Revise bcc.spec to address rpmlint issues and build properly in Fedora koji.
+
+* Mon Apr 04 2016 Vicent Marti <vicent@github.com> - 0.1.4-1
+- Add bcc-lua package
+
+* Sun Nov 29 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.3-1
+- Add bcc-tools package
+
+* Mon Oct 12 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.2-1
+- Add better version numbering into libbcc.so
+
+* Fri Jul 03 2015 Brenden Blanco <bblanco@plumgrid.com> - 0.1.1-2
+- Initial RPM Release

cmake/FindLibElf.cmake

+# - Try to find libelf
+# Once done this will define
+#
+#  LIBELF_FOUND - system has libelf
+#  LIBELF_INCLUDE_DIRS - the libelf include directory
+#  LIBELF_LIBRARIES - Link these to use libelf
+#  LIBELF_DEFINITIONS - Compiler switches required for using libelf
+#
+#  Copyright (c) 2008 Bernhard Walle <bernhard.walle@gmx.de>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (LIBELF_LIBRARIES AND LIBELF_INCLUDE_DIRS)
+  set (LibElf_FIND_QUIETLY TRUE)
+endif (LIBELF_LIBRARIES AND LIBELF_INCLUDE_DIRS)
+
+find_path (LIBELF_INCLUDE_DIRS
+  NAMES
+    libelf.h
+  PATHS
+    /usr/include
+    /usr/include/libelf
+    /usr/local/include
+    /usr/local/include/libelf
+    /opt/local/include
+    /opt/local/include/libelf
+    /sw/include
+    /sw/include/libelf
+    ENV CPATH)
+
+find_library (LIBELF_LIBRARIES
+  NAMES
+    elf
+  PATHS
+    /usr/lib
+    /usr/local/lib
+    /opt/local/lib
+    /sw/lib
+    ENV LIBRARY_PATH
+    ENV LD_LIBRARY_PATH)
+
+include (FindPackageHandleStandardArgs)
+
+
+# handle the QUIETLY and REQUIRED arguments and set LIBELF_FOUND to TRUE if all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibElf DEFAULT_MSG
+  LIBELF_LIBRARIES
+  LIBELF_INCLUDE_DIRS)
+
+SET(CMAKE_REQUIRED_LIBRARIES elf)
+INCLUDE(CheckCXXSourceCompiles)
+CHECK_CXX_SOURCE_COMPILES("#include <libelf.h>
+int main() {
+  Elf *e = (Elf*)0;
+  size_t sz;
+  elf_getshdrstrndx(e, &sz);
+  return 0;
+}" ELF_GETSHDRSTRNDX)
+
+mark_as_advanced(LIBELF_INCLUDE_DIRS LIBELF_LIBRARIES ELF_GETSHDRSTRNDX)

cmake/FindLuaJIT.cmake

+# Locate Lua library
+# This module defines
+#  LUAJIT_FOUND, if false, do not try to link to Lua
+#  LUAJIT_LIBRARIES
+#  LUAJIT_INCLUDE_DIR, where to find lua.h
+#
+# Note that the expected include convention is
+#  #include "lua.h"
+# and not
+#  #include <lua/lua.h>
+# This is because, the lua location is not standardized and may exist
+# in locations other than lua/
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+#
+# ################
+# 2010 - modified for cronkite to find luajit instead of lua, as it was before.
+#
+
+FIND_PATH(LUAJIT_INCLUDE_DIR lua.h
+  HINTS
+  $ENV{LUAJIT_DIR}
+  PATH_SUFFIXES include/luajit-2.0 include/luajit2.0 include/luajit include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+FIND_LIBRARY(LUAJIT_LIBRARY
+  NAMES libluajit-51.a libluajit-5.1.a libluajit.a
+  HINTS
+  $ENV{LUAJIT_DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+IF(LUAJIT_LIBRARY)
+  IF(UNIX AND NOT APPLE)
+    FIND_LIBRARY(LUAJIT_MATH_LIBRARY m)
+	FIND_LIBRARY(LUAJIT_DL_LIBRARY dl)
+	SET( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY};${LUAJIT_DL_LIBRARY};${LUAJIT_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
+  ELSE(UNIX AND NOT APPLE)
+    SET( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}" CACHE STRING "Lua Libraries")
+  ENDIF(UNIX AND NOT APPLE)
+ENDIF(LUAJIT_LIBRARY)
+
+INCLUDE(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT  DEFAULT_MSG  LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY)

cmake/version.cmake

 # Copyright (c) PLUMgrid, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
-get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-string(SUBSTRING "${GIT_SHA1}" 0 8 GIT_SHA1_SHORT)
-git_describe(GIT_DESCRIPTION)
-git_describe(GIT_TAG_LAST "--abbrev=0")
-git_get_exact_tag(GIT_TAG_EXACT)
 if(NOT REVISION)
+  get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+  string(SUBSTRING "${GIT_SHA1}" 0 8 GIT_SHA1_SHORT)
+  git_describe(GIT_DESCRIPTION)
+  git_describe(GIT_TAG_LAST "--abbrev=0")
+  git_get_exact_tag(GIT_TAG_EXACT)
   string(SUBSTRING "${GIT_TAG_LAST}-${GIT_SHA1_SHORT}" 1 -1 REVISION)
   if(GIT_TAG_EXACT)
     string(SUBSTRING "${GIT_TAG_EXACT}" 1 -1 REVISION)
@@ -15,9 +15,13 @@ if(NOT REVISION)
     set(GIT_TAG_EXACT "")
   endif()
   message(STATUS "Git HEAD is ${GIT_SHA1}")
+  # rpm/deb packaging uses this, only works on whole tag numbers
+  if(NOT REVISION_LAST)
+    string(SUBSTRING "${GIT_TAG_LAST}" 1 -1 REVISION_LAST)
+  endif()
+else()
+  set(REVISION_LAST "${REVISION}")
 endif()
 
 # strip leading 'v', and make unique for the tag
 message(STATUS "Revision is ${REVISION}")
-# rpm/deb packaging uses this, only works on whole tag numbers
-string(SUBSTRING "${GIT_TAG_LAST}" 1 -1 REVISION_LAST)

debian/bcc-lua.install

+usr/bin/bcc-lua

debian/bcc-tools.install

+usr/share/bcc/tools/*
+usr/share/bcc/man/*

debian/changelog

+bcc (0.2.0-1) unstable; urgency=low
+
+  * Add many new utilities in tools/
+  * Support for USDT
+  * Support for lua
+  * Many utilities converted to perf ring buffer
+  * Support for tracepoints
+
+ -- Brenden Blanco <bblanco@plumgrid.com>  Thu, 08 Sep 2016 17:05:28 -0700
+
+bcc (0.1.8-1) unstable; urgency=low
+
+  * Add many new utilities in tools/
+   * wakeuptime, offwaketime, argdist, {xfs,zfs,ext4}{slower,dist}, others
+  * Support for bpf_perf_event()
+  * Support for public tables shared between programs
+  * Support for up to 4.4 features
+  * Remove external file dependencies from clang lib
+
+ -- Brenden Blanco <bblanco@plumgrid.com>  Mon, 23 Feb 2016 00:41:00 +0000
+
+bcc (0.1.7-1) unstable; urgency=low
+
+  * Tracing features and bugfixes
+  * Built against LLVM 3.8 HEAD
+
+ -- Brenden Blanco <bblanco@plumgrid.com>  Mon, 12 Oct 2015 16:47:09 +0000
+
 bcc (0.1.6-1) unstable; urgency=low
 
   * Stability fixes

debian/control

@@ -3,12 +3,12 @@ Maintainer: Brenden Blanco <bblanco@plumgrid.com>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), cmake, libllvm3.8, llvm-3.8-dev, libclang-3.8-dev
+Build-Depends: debhelper (>= 9), cmake, libllvm3.7 | libllvm3.8, llvm-3.7-dev | llvm-3.8-dev, libclang-3.7-dev | libclang-3.8-dev, libelf-dev, bison, flex, libedit-dev, clang-format | clang-format-3.7, python-netaddr, python-pyroute2, luajit, libluajit-5.1-dev
 Homepage: https://github.com/iovisor/bcc
 
 Package: libbcc
 Architecture: amd64
-Depends: libc6, libstdc++6, make, gcc
+Depends: libc6, libstdc++6, libelf1
 Description: Shared Library for BPF Compiler Collection (BCC)
  Shared Library for BPF Compiler Collection to control BPF programs
  from userspace.
@@ -20,5 +20,15 @@ Description: Shared Library for BPF Compiler Collection (BCC)
 
 Package: python-bcc
 Architecture: all
-Depends: libbcc, python
+Depends: libbcc, python, binutils
 Description: Python wrappers for BPF Compiler Collection (BCC)
+
+Package: bcc-tools
+Architecture: all
+Depends: python-bcc
+Description: Command line tools for BPF Compiler Collection (BCC)
+
+Package: bcc-lua
+Architecture: all
+Depends: libbcc
+Description: Standalone tool to run BCC tracers written in Lua

debian/libbcc.install

 usr/include/bcc/*
-usr/lib/libbcc* /usr/lib/x86_64-linux-gnu/
-usr/share/bcc/include/*
+usr/lib/x86_64-linux-gnu/libbcc*

debian/python-bpf.install → debian/python-bcc.install

 usr/lib/python*
-usr/bin/bpf-run

debian/rules

@@ -11,5 +11,6 @@ UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: ([0-9.]+
 %:
 	dh $@ --buildsystem=cmake --parallel
 
+# FIXME: LLVM_DEFINITIONS is broken somehow in LLVM cmake upstream
 override_dh_auto_configure:
-	dh_auto_configure -- -DREVISION=$(UPSTREAM_VERSION)
+	dh_auto_configure -- -DREVISION_LAST=$(UPSTREAM_VERSION) -DREVISION=$(UPSTREAM_VERSION) -DLLVM_DEFINITIONS="-D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"

examples/CMakeLists.txt

-set(EXAMPLE_FILES hello_world.py task_switch.py task_switch.c simple_tc.py
-                  simulation.py vlan_learning.py vlan_learning.c)
-install(FILES ${EXAMPLE_FILES} DESTINATION share/bcc/examples)
+set(EXAMPLE_PROGRAMS hello_world.py)
+install(PROGRAMS ${EXAMPLE_PROGRAMS} DESTINATION share/bcc/examples)
 
-add_subdirectory(distributed_bridge)
+add_subdirectory(cpp)
+add_subdirectory(lua)
+add_subdirectory(networking)
+add_subdirectory(tracing)

examples/bitehist.c

-/*
- * bitehist.c	Block I/O size histogram.
- *		For Linux, uses BCC, eBPF. See .py file.
- *
- * Based on eBPF sample tracex2 by Alexi Starovoitov.
- * Copyright (c) 2013-2015 PLUMgrid, http://plumgrid.com
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 15-Aug-2015	Brendan Gregg	Created this.
- */
-
-#include <uapi/linux/ptrace.h>
-#include <linux/blkdev.h>
-
-BPF_TABLE("array", int, u64, dist, 64);
-
-static unsigned int log2(unsigned int v)
-{
-	unsigned int r;
-	unsigned int shift;
-
-	r = (v > 0xFFFF) << 4; v >>= r;
-	shift = (v > 0xFF) << 3; v >>= shift; r |= shift;
-	shift = (v > 0xF) << 2; v >>= shift; r |= shift;
-	shift = (v > 0x3) << 1; v >>= shift; r |= shift;
-	r |= (v >> 1);
-	return r;
-}
-
-static unsigned int log2l(unsigned long v)
-{
-	unsigned int hi = v >> 32;
-	if (hi)
-		return log2(hi) + 32 + 1;
-	else
-		return log2(v) + 1;
-}
-
-int kprobe__blk_start_request(struct pt_regs *ctx, struct request *req)
-{
-	int index = log2l(req->__data_len / 1024);
-	u64 *leaf = dist.lookup(&index);
-	if (leaf) (*leaf)++;
-
-	return 0;
-}

examples/cpp/CMakeLists.txt

+# Copyright (c) Facebook, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License")
+
+include_directories(${CMAKE_SOURCE_DIR}/src/cc)
+
+add_executable(HelloWorld HelloWorld.cc)
+target_link_libraries(HelloWorld bcc-static)
+install (TARGETS HelloWorld DESTINATION share/bcc/examples/cpp)
+
+add_executable(CPUDistribution CPUDistribution.cc)
+target_link_libraries(CPUDistribution bcc-static)
+install (TARGETS CPUDistribution DESTINATION share/bcc/examples/cpp)
+
+add_executable(RecordMySQLQuery RecordMySQLQuery.cc)
+target_link_libraries(RecordMySQLQuery bcc-static)
+install (TARGETS RecordMySQLQuery DESTINATION share/bcc/examples/cpp)
+
+add_executable(TCPSendStack TCPSendStack.cc)
+target_link_libraries(TCPSendStack bcc-static)
+install (TARGETS TCPSendStack DESTINATION share/bcc/examples/cpp)
+
+add_executable(RandomRead RandomRead.cc)
+target_link_libraries(RandomRead bcc-static)
+install (TARGETS RandomRead DESTINATION share/bcc/examples/cpp)

examples/cpp/CPUDistribution.cc

+/*
+ * CPUDistribution Show load distribution across CPU cores during a period of
+ *                 time. For Linux, uses BCC, eBPF. Embedded C.
+ *
+ * Basic example of BCC and kprobes.
+ *
+ * USAGE: CPUDistribution [duration]
+ *
+ * Copyright (c) Facebook, Inc.
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
+
+#include <unistd.h>
+#include <cstdlib>
+#include <iomanip>
+#include <iostream>
+#include <string>
+
+#include "BPF.h"
+
+const std::string BPF_PROGRAM = R"(
+#include <linux/sched.h>
+#include <uapi/linux/ptrace.h>
+
+BPF_HASH(pid_to_cpu, pid_t, int);
+BPF_HASH(pid_to_ts, pid_t, uint64_t);
+BPF_HASH(cpu_time, int, uint64_t);
+
+int task_switch_event(struct pt_regs *ctx, struct task_struct *prev) {
+  pid_t prev_pid = prev->pid;
+  int* prev_cpu = pid_to_cpu.lookup(&prev_pid);
+  uint64_t* prev_ts = pid_to_ts.lookup(&prev_pid);
+
+  pid_t cur_pid = bpf_get_current_pid_tgid();
+  int cur_cpu = bpf_get_smp_processor_id();
+  uint64_t cur_ts = bpf_ktime_get_ns();
+
+  uint64_t this_cpu_time = 0;
+  if (prev_ts) {
+    pid_to_ts.delete(&prev_pid);
+    this_cpu_time = (cur_ts - *prev_ts);
+  }
+  if (prev_cpu) {
+    pid_to_cpu.delete(&prev_pid);
+    if (this_cpu_time > 0) {
+      int cpu_key = *prev_cpu;
+      uint64_t* history_time = cpu_time.lookup(&cpu_key);
+      if (history_time)
+        this_cpu_time += *history_time;
+      cpu_time.update(&cpu_key, &this_cpu_time);
+    }
+  }
+
+  pid_to_cpu.update(&cur_pid, &cur_cpu);
+  pid_to_ts.update(&cur_pid, &cur_ts);
+
+  return 0;
+}
+)";
+
+int main(int argc, char** argv) {
+  ebpf::BPF bpf;
+  auto init_res = bpf.init(BPF_PROGRAM);
+  if (init_res.code() != 0) {
+    std::cerr << init_res.msg() << std::endl;
+    return 1;
+  }
+
+  auto attach_res =
+      bpf.attach_kprobe("finish_task_switch", "task_switch_event");
+  if (attach_res.code() != 0) {
+    std::cerr << attach_res.msg() << std::endl;
+    return 1;
+  }
+
+  int probe_time = 10;
+  if (argc == 2) {
+    probe_time = atoi(argv[1]);
+  }
+  std::cout << "Probing for " << probe_time << " seconds" << std::endl;
+  sleep(probe_time);
+
+  auto table = bpf.get_hash_table<int, uint64_t>("cpu_time");
+  auto num_cores = sysconf(_SC_NPROCESSORS_ONLN);
+  for (int i = 0; i < num_cores; i++) {
+    std::cout << "CPU " << std::setw(2) << i << " worked for ";
+    std::cout << (table[i] / 1000000.0) << " ms." << std::endl;
+  }
+
+  auto detach_res = bpf.detach_kprobe("finish_task_switch");
+  if (detach_res.code() != 0) {
+    std::cerr << detach_res.msg() << std::endl;
+    return 1;
+  }
+
+  return 0;
+}

examples/cpp/HelloWorld.cc

+/*
+ * Copyright (c) Facebook, Inc.
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
+
+#include <unistd.h>
+#include <fstream>
+#include <iostream>
+#include <string>
+
+#include "BPF.h"
+
+const std::string BPF_PROGRAM = R"(
+int on_sys_clone(void *ctx) {
+  bpf_trace_printk("Hello, World! Here I did a sys_clone call!\n");
+  return 0;
+}
+)";
+
+int main() {
+  ebpf::BPF bpf;
+  auto init_res = bpf.init(BPF_PROGRAM);
+  if (init_res.code() != 0) {
+    std::cerr << init_res.msg() << std::endl;
+    return 1;
+  }
+
+  std::ifstream pipe("/sys/kernel/debug/tracing/trace_pipe");
+  std::string line;
+
+  auto attach_res = bpf.attach_kprobe("sys_clone", "on_sys_clone");
+  if (attach_res.code() != 0) {
+    std::cerr << attach_res.msg() << std::endl;
+    return 1;
+  }
+
+  while (true) {
+    if (std::getline(pipe, line)) {
+      std::cout << line << std::endl;
+      // Detach the probe if we got at least one line.
+      auto detach_res = bpf.detach_kprobe("sys_clone");
+      if (detach_res.code() != 0) {
+        std::cerr << detach_res.msg() << std::endl;
+        return 1;
+      }
+      break;
+    } else {
+      std::cout << "Waiting for a sys_clone event" << std::endl;
+      sleep(1);
+    }
+  }
+
+  return 0;
+}

examples/cpp/RandomRead.cc

+/*
+ * RandomRead Monitor random number read events.
+ *            For Linux, uses BCC, eBPF. Embedded C.
+ *
+ * Basic example of BCC Tracepoint and perf buffer.
+ *
+ * USAGE: RandomRead
+ *
+ * Copyright (c) Facebook, Inc.
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
+
+#include <signal.h>
+#include <iostream>
+
+#include "BPF.h"
+
+const std::string BPF_PROGRAM = R"(
+#include <linux/sched.h>
+#include <uapi/linux/ptrace.h>
+
+struct urandom_read_args {
+  // See /sys/kernel/debug/tracing/events/random/urandom_read/format
+  uint64_t common__unused;
+  int got_bits;
+  int pool_left;
+  int input_left;
+};
+
+struct event_t {
+  int pid;
+  char comm[16];
+  int got_bits;
+};
+
+BPF_PERF_OUTPUT(events);
+
+int on_urandom_read(struct urandom_read_args* attr) {
+  struct event_t event = {};
+  event.pid = bpf_get_current_pid_tgid();
+  bpf_get_current_comm(&event.comm, sizeof(event.comm));
+  event.got_bits = attr->got_bits;
+
+  events.perf_submit(attr, &event, sizeof(event));
+  return 0;
+}
+)";
+
+// Define the same struct to use in user space.
+struct event_t {
+  int pid;
+  char comm[16];
+  int got_bits;
+};
+
+void handle_output(void* cb_cookie, void* data, int data_size) {
+  auto event = static_cast<event_t*>(data);
+  std::cout << "PID: " << event->pid << " (" << event->comm << ") "
+            << "Read " << event->got_bits << " bits" << std::endl;
+}
+
+ebpf::BPF* bpf;
+
+void signal_handler(int s) {
+  std::cerr << "Terminating..." << std::endl;
+  delete bpf;
+  exit(0);
+}
+
+int main(int argc, char** argv) {
+  bpf = new ebpf::BPF();
+  auto init_res = bpf->init(BPF_PROGRAM);
+  if (init_res.code() != 0) {
+    std::cerr << init_res.msg() << std::endl;
+    return 1;
+  }
+
+  auto attach_res =
+      bpf->attach_tracepoint("random:urandom_read", "on_urandom_read");
+  if (attach_res.code() != 0) {
+    std::cerr << attach_res.msg() << std::endl;
+    return 1;
+  }
+
+  auto open_res = bpf->open_perf_buffer("events", &handle_output);
+  if (open_res.code() != 0) {
+    std::cerr << open_res.msg() << std::endl;
+    return 1;
+  }
+
+  signal(SIGINT, signal_handler);
+  std::cout << "Started tracing, hit Ctrl-C to terminate." << std::endl;
+  while (true)
+    bpf->poll_perf_buffer("events");
+
+  return 0;
+}

examples/cpp/RecordMySQLQuery.cc

+/*
+ * RecordMySQLQuery Record MySQL queries by probing the alloc_query() function
+ *                  in mysqld. For Linux, uses BCC, eBPF. Embedded C.
+ *
+ * Basic example of BCC and uprobes.
+ *
+ * Copyright (c) Facebook, Inc.
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
+
+#include <unistd.h>
+#include <algorithm>
+#include <cstdlib>
+#include <iostream>
+#include <string>
+
+#include "BPF.h"
+
+const std::string BPF_PROGRAM = R"(
+#include <linux/ptrace.h>
+
+struct query_probe_t {
+  uint64_t ts;
+  pid_t pid;
+  char query[100];
+};
+
+BPF_HASH(queries, struct query_probe_t, int);
+
+int probe_mysql_query(struct pt_regs *ctx, void* thd, char* query, size_t len) {
+  if (query) {
+    struct query_probe_t key = {};
+
+    key.ts = bpf_ktime_get_ns();
+    key.pid = bpf_get_current_pid_tgid();
+
+    bpf_probe_read(&key.query, sizeof(key.query), query);
+
+    int one = 1;
+    queries.update(&key, &one);
+  }
+  return 0;
+}
+)";
+const std::string ALLOC_QUERY_FUNC = "_Z11alloc_queryP3THDPKcj";
+
+// Define the same struct to use in user space.
+struct query_probe_t {
+  uint64_t ts;
+  pid_t pid;
+  char query[100];
+};
+
+int main(int argc, char** argv) {
+  if (argc < 2) {
+    std::cout << "USAGE: RecordMySQLQuery PATH_TO_MYSQLD [duration]"
+              << std::endl;
+    exit(1);
+  }
+
+  std::string mysql_path(argv[1]);
+  std::cout << "Using mysqld path: " << mysql_path << std::endl;
+
+  ebpf::BPF bpf;
+  auto init_res = bpf.init(BPF_PROGRAM);
+  if (init_res.code() != 0) {
+    std::cerr << init_res.msg() << std::endl;
+    return 1;
+  }
+
+  auto attach_res =
+      bpf.attach_uprobe(mysql_path, ALLOC_QUERY_FUNC, "probe_mysql_query");
+  if (attach_res.code() != 0) {
+    std::cerr << attach_res.msg() << std::endl;
+    return 1;
+  }
+
+  int probe_time = 10;
+  if (argc >= 3)
+    probe_time = atoi(argv[2]);
+  std::cout << "Probing for " << probe_time << " seconds" << std::endl;
+  sleep(probe_time);
+
+  auto table_handle = bpf.get_hash_table<query_probe_t, int>("queries");
+  auto table = table_handle.get_table_offline();
+  std::sort(table.begin(), table.end(), [](std::pair<query_probe_t, int> a,
+                                           std::pair<query_probe_t, int> b) {
+    return a.first.ts < b.first.ts;
+  });
+  std::cout << table.size() << " queries recorded:" << std::endl;
+  for (auto it : table) {
+    std::cout << "Time: " << it.first.ts << " PID: " << it.first.pid
+              << " Query: " << it.first.query << std::endl;
+  }
+
+  auto detach_res = bpf.detach_uprobe(mysql_path, ALLOC_QUERY_FUNC);
+  if (detach_res.code() != 0) {
+    std::cerr << detach_res.msg() << std::endl;
+    return 1;
+  }
+
+  return 0;
+}

examples/cpp/TCPSendStack.cc

+/*
+ * TCPSendStack Summarize tcp_sendmsg() calling stack traces.
+ *              For Linux, uses BCC, eBPF. Embedded C.
+ *
+ * Basic example of BCC in-kernel stack trace dedup.
+ *
+ * USAGE: TCPSendStack [duration]
+ *
+ * Copyright (c) Facebook, Inc.
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
+
+#include <unistd.h>
+#include <algorithm>
+#include <iostream>
+
+#include "BPF.h"
+
+const std::string BPF_PROGRAM = R"(
+#include <linux/sched.h>
+#include <uapi/linux/ptrace.h>
+
+struct stack_key_t {
+  int pid;
+  char name[16];
+  int user_stack;
+  int kernel_stack;
+};
+
+BPF_STACK_TRACE(stack_traces, 10240)
+BPF_HASH(counts, struct stack_key_t, uint64_t);
+
+int on_tcp_send(struct pt_regs *ctx) {
+  struct stack_key_t key = {};
+  key.pid = bpf_get_current_pid_tgid();
+  bpf_get_current_comm(&key.name, sizeof(key.name));
+  key.kernel_stack = stack_traces.get_stackid(ctx, BPF_F_REUSE_STACKID);
+  key.user_stack = stack_traces.get_stackid(
+    ctx, BPF_F_REUSE_STACKID | BPF_F_USER_STACK
+  );
+
+  u64 zero = 0, *val;
+  val = counts.lookup_or_init(&key, &zero);
+  (*val)++;
+
+  return 0;
+}
+)";
+
+// Define the same struct to use in user space.
+struct stack_key_t {
+  int pid;
+  char name[16];
+  int user_stack;
+  int kernel_stack;
+};
+
+int main(int argc, char** argv) {
+  ebpf::BPF bpf;
+  auto init_res = bpf.init(BPF_PROGRAM);
+  if (init_res.code() != 0) {
+    std::cerr << init_res.msg() << std::endl;
+    return 1;
+  }
+
+  auto attach_res = bpf.attach_kprobe("tcp_sendmsg", "on_tcp_send");
+  if (attach_res.code() != 0) {
+    std::cerr << attach_res.msg() << std::endl;
+    return 1;
+  }
+
+  int probe_time = 10;
+  if (argc == 2) {
+    probe_time = atoi(argv[1]);
+  }
+  std::cout << "Probing for " << probe_time << " seconds" << std::endl;
+  sleep(probe_time);
+
+  auto table =
+      bpf.get_hash_table<stack_key_t, uint64_t>("counts").get_table_offline();
+  std::sort(table.begin(), table.end(), [](std::pair<stack_key_t, uint64_t> a,
+                                           std::pair<stack_key_t, uint64_t> b) {
+    return a.second < b.second;
+  });
+  auto stacks = bpf.get_stack_table("stack_traces");
+
+  for (auto it : table) {
+    std::cout << "PID: " << it.first.pid << " (" << it.first.name << ") "
+              << "made " << it.second
+              << " TCP sends on following stack: " << std::endl;
+    std::cout << "  Kernel Stack:" << std::endl;
+    if (it.first.kernel_stack >= 0) {
+      auto syms = stacks.get_stack_symbol(it.first.kernel_stack, -1);
+      for (auto sym : syms)
+        std::cout << "    " << sym << std::endl;
+    } else
+      std::cout << "    " << it.first.kernel_stack << std::endl;
+    std::cout << "  User Stack:" << std::endl;
+    if (it.first.user_stack >= 0) {
+      auto syms = stacks.get_stack_symbol(it.first.user_stack, it.first.pid);
+      for (auto sym : syms)
+        std::cout << "    " << sym << std::endl;
+    } else
+      std::cout << "    " << it.first.user_stack << std::endl;
+  }
+
+  auto detach_res = bpf.detach_kprobe("tcp_sendmsg");
+  if (detach_res.code() != 0) {
+    std::cerr << detach_res.msg() << std::endl;
+    return 1;
+  }
+
+  return 0;
+}

examples/disksnoop.c

-/*
- * disksnoop.c	Trace block device I/O: basic version of iosnoop.
- *		For Linux, uses BCC, eBPF. See .py file.
- *
- * Copyright (c) 2015 Brendan Gregg.
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 11-Aug-2015	Brendan Gregg	Created this.
- */
-
-#include <uapi/linux/ptrace.h>
-#include <linux/blkdev.h>
-
-BPF_HASH(start, struct request *);
-
-void kprobe__blk_start_request(struct pt_regs *ctx, struct request *req) {
-	// stash start timestamp by request ptr
-	u64 ts = bpf_ktime_get_ns();
-
-	start.update(&req, &ts);
-}
-
-void kprobe__blk_update_request(struct pt_regs *ctx, struct request *req) {
-	u64 *tsp, delta;
-
-	tsp = start.lookup(&req);
-	if (tsp != 0) {
-		delta = bpf_ktime_get_ns() - *tsp;
-		bpf_trace_printk("%d %x %d\n", req->__data_len,
-		    req->cmd_flags, delta / 1000);
-		start.delete(&req);
-	}
-}

examples/distributed_bridge/CMakeLists.txt

-set(EXAMPLE_FILES main.py simulation.py tunnel_mesh.py tunnel.py
-                  tunnel.c tunnel_mesh.c)
-install(FILES ${EXAMPLE_FILES} DESTINATION share/bcc/examples/distributed_bridge)

examples/hello_world.py

@@ -8,4 +8,4 @@
 
 from bcc import BPF
 
-BPF(text='void kprobe__sys_clone(void *ctx) { bpf_trace_printk("Hello, World!\\n"); }').trace_print()
+BPF(text='int kprobe__sys_clone(void *ctx) { bpf_trace_printk("Hello, World!\\n"); return 0; }').trace_print()

examples/lua/CMakeLists.txt

+file(GLOB C_FILES *.c)
+file(GLOB LUA_FILES *.lua)
+install(FILES ${C_FILES} DESTINATION share/bcc/examples/lua)
+install(PROGRAMS ${LUA_FILES} DESTINATION share/bcc/examples/lua)
\ No newline at end of file

examples/lua/bashreadline.c

+#include <uapi/linux/ptrace.h>
+
+struct str_t {
+	u64 pid;
+	char str[80];
+};
+
+BPF_PERF_OUTPUT(events);
+
+int printret(struct pt_regs *ctx)
+{
+	struct str_t data  = {};
+	u32 pid;
+        if (!PT_REGS_RC(ctx))
+          return 0;
+        pid = bpf_get_current_pid_tgid();
+        data.pid = pid;
+        bpf_probe_read(&data.str, sizeof(data.str), (void *)PT_REGS_RC(ctx));
+        events.perf_submit(ctx, &data, sizeof(data));
+        return 0;
+};

examples/lua/bashreadline.lua

+#!/usr/bin/env bcc-lua
+--[[
+Copyright 2016 GitHub, Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]
+local ffi = require("ffi")
+
+return function(BPF)
+  local b = BPF:new{src_file="bashreadline.c", debug=0}
+  b:attach_uprobe{name="/bin/bash", sym="readline", fn_name="printret", retprobe=true}
+
+  local function print_readline(cpu, event)
+    print("%-9s %-6d %s" % {os.date("%H:%M:%S"), tonumber(event.pid), ffi.string(event.str)})
+  end
+
+  b:get_table("events"):open_perf_buffer(print_readline, "struct { uint64_t pid; char str[80]; }")
+
+  print("%-9s %-6s %s" % {"TIME", "PID", "COMMAND"})
+  b:kprobe_poll_loop()
+end

examples/lua/kprobe-latency.lua

+#!/usr/bin/env bcc-lua
+--[[
+Copyright 2016 Marek Vavrusa <mvavrusa@cloudflare.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]
+-- This example program measures latency of block device operations and plots it
+-- in a histogram. It is similar to BPF example:
+-- https://github.com/torvalds/linux/blob/master/samples/bpf/tracex3_kern.c
+local ffi = require('ffi')
+local bpf = require('bpf')
+local S = require('syscall')
+
+-- Shared part of the program
+local bins = 100
+local map = bpf.map('hash', 512, ffi.typeof('uint64_t'), ffi.typeof('uint64_t'))
+local lat_map = bpf.map('array', bins)
+
+-- Kernel-space part of the program
+local trace_start = bpf.kprobe('myprobe:blk_start_request', function (ptregs)
+	map[ptregs.parm1] = time()
+end, false, -1, 0)
+local trace_end = bpf.kprobe('myprobe2:blk_account_io_completion', function (ptregs)
+	-- The lines below are computing index
+	-- using log10(x)*10 = log2(x)*10/log2(10) = log2(x)*3
+	-- index = 29 ~ 1 usec
+	-- index = 59 ~ 1 msec
+	-- index = 89 ~ 1 sec
+	-- index = 99 ~ 10sec or more
+	local delta = time() - map[ptregs.parm1]
+	local index = 3 * math.log2(delta)
+	if index >= bins then
+		index = bins-1
+	end
+	xadd(lat_map[index], 1)
+	return true
+end, false, -1, 0)
+-- User-space part of the program
+pcall(function()
+	local counter = 0
+	local sym = {' ',' ','.','.','*','*','o','o','O','O','#','#'}
+	while true do
+		-- Print header once in a while
+		if counter % 50 == 0 then
+			print('|1us      |10us     |100us    |1ms      |10ms     |100ms    |1s       |10s')
+			counter = 0
+		end
+		counter = counter + 1
+		-- Collect all events
+		local hist, events = {}, 0
+		for i=29,bins-1 do
+			local v = tonumber(lat_map[i] or 0)
+			if v > 0 then
+				hist[i] = hist[i] or 0 + v
+				events = events + v
+			end
+		end
+		-- Print histogram symbols based on relative frequency
+		local s = ''
+		for i=29,bins-1 do
+			if hist[i] then
+				local c = math.ceil((hist[i] / (events + 1)) * #sym)
+				s = s .. sym[c]
+			else s = s .. ' ' end
+		end
+		print(s .. string.format('  ; %d events', events))
+		S.sleep(1)
+	end
+end)
\ No newline at end of file

examples/lua/kprobe-write.lua

+#!/usr/bin/env bcc-lua
+--[[
+Copyright 2016 Marek Vavrusa <mvavrusa@cloudflare.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]
+-- Simple tracing example that executes a program on
+-- return from sys_write() and tracks the number of hits
+local ffi = require('ffi')
+local bpf = require('bpf')
+local S = require('syscall')
+
+-- Shared part of the program
+local map = bpf.map('array', 1)
+-- Kernel-space part of the program
+local probe = bpf.kprobe('myprobe:sys_write', function (ptregs)
+   xadd(map[0], 1)
+end, true)
+-- User-space part of the program
+pcall(function()
+	for _ = 1, 10 do
+	   print('hits: ', tonumber(map[0]))
+	   S.sleep(1)
+	end
+end)

examples/lua/offcputime.lua

+#!/usr/bin/env bcc-lua
+--[[
+Copyright 2016 GitHub, Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]
+
+local program = [[
+#include <uapi/linux/ptrace.h>
+#include <linux/sched.h>
+
+#define MINBLOCK_US	1
+
+struct key_t {
+    char name[TASK_COMM_LEN];
+    int stack_id;
+};
+BPF_HASH(counts, struct key_t);
+BPF_HASH(start, u32);
+BPF_STACK_TRACE(stack_traces, 10240)
+
+int oncpu(struct pt_regs *ctx, struct task_struct *prev) {
+    u32 pid;
+    u64 ts, *tsp;
+
+    // record previous thread sleep time
+    if (FILTER) {
+        pid = prev->pid;
+        ts = bpf_ktime_get_ns();
+        start.update(&pid, &ts);
+    }
+
+    // calculate current thread's delta time
+    pid = bpf_get_current_pid_tgid();
+    tsp = start.lookup(&pid);
+    if (tsp == 0)
+        return 0;        // missed start or filtered
+    u64 delta = bpf_ktime_get_ns() - *tsp;
+    start.delete(&pid);
+    delta = delta / 1000;
+    if (delta < MINBLOCK_US)
+        return 0;
+
+    // create map key
+    u64 zero = 0, *val;
+    struct key_t key = {};
+    int stack_flags = BPF_F_REUSE_STACKID;
+
+    /*
+    if (!(prev->flags & PF_KTHREAD))
+      stack_flags |= BPF_F_USER_STACK;
+    */
+
+    bpf_get_current_comm(&key.name, sizeof(key.name));
+    key.stack_id = stack_traces.get_stackid(ctx, stack_flags);
+
+    val = counts.lookup_or_init(&key, &zero);
+    (*val) += delta;
+    return 0;
+}
+]]
+
+return function(BPF, utils)
+  local ffi = require("ffi")
+
+  local parser = utils.argparse("offcputime", "Summarize off-cpu time")
+  parser:flag("-u --user-only")
+  parser:option("-p --pid"):convert(tonumber)
+  parser:flag("-f --folded")
+  parser:option("-d --duration", "duration to trace for", 9999999):convert(tonumber)
+
+  local args = parser:parse()
+  local ksym = BPF.SymbolCache()
+  local filter = "1"
+  local MAXDEPTH = 20
+
+  if args.pid then
+    filter = "pid == %d" % args.pid
+  elseif args.user_only then
+    filter = "!(prev->flags & PF_KTHREAD)"
+  end
+
+  local text = program:gsub("FILTER", filter)
+  local b = BPF:new{text=text}
+  b:attach_kprobe{event="finish_task_switch", fn_name="oncpu"}
+
+  if BPF.num_open_kprobes() == 0 then
+    print("no functions matched. quitting...")
+    return
+  end
+
+  print("Sleeping for %d seconds..." % args.duration)
+  pcall(utils.posix.sleep, args.duration)
+  print("Tracing...")
+
+  local counts = b:get_table("counts")
+  local stack_traces = b:get_table("stack_traces")
+
+  for k, v in counts:items() do
+    for addr in stack_traces:walk(tonumber(k.stack_id)) do
+      print("    %-16p %s" % {addr, ksym:resolve(addr)})
+    end
+    print("    %-16s %s" % {"-", ffi.string(k.name)})
+    print("        %d\n" % tonumber(v))
+  end
+end

examples/networking/CMakeLists.txt

+set(EXAMPLE_FILES simulation.py)
+set(EXAMPLE_PROGRAMS simple_tc.py tc_perf_event.py)
+install(FILES ${EXAMPLE_FILES} DESTINATION share/bcc/examples/networking)
+install(PROGRAMS ${EXAMPLE_PROGRAMS} DESTINATION share/bcc/examples/networking)
+
+add_subdirectory(distributed_bridge)
+add_subdirectory(neighbor_sharing)
+add_subdirectory(vlan_learning)
+add_subdirectory(tunnel_monitor)
+add_subdirectory(http_filter)
+add_subdirectory(xdp)

examples/networking/distributed_bridge/CMakeLists.txt

+set(EXAMPLE_FILES simulation.py tunnel.c tunnel_mesh.c)
+set(EXAMPLE_PROGRAMS main.py tunnel_mesh.py tunnel.py)
+install(FILES ${EXAMPLE_FILES} DESTINATION share/bcc/examples/networking/distributed_bridge)
+install(PROGRAMS ${EXAMPLE_PROGRAMS} DESTINATION share/bcc/examples/networking/distributed_bridge)

examples/distributed_bridge/tunnel.py → examples/networking/distributed_bridge/tunnel.py

@@ -35,7 +35,7 @@ ifc_gc = []
 def run():
     ipdb.routes.add({"dst": "224.0.0.0/4", "oif": ifc.index}).commit()
     with ipdb.create(ifname="vxlan0", kind="vxlan", vxlan_id=0,
-                     vxlan_link=ifc, vxlan_port=htons(4789),
+                     vxlan_link=ifc, vxlan_port=4789,
                      vxlan_group=str(mcast), vxlan_flowbased=True,
                      vxlan_collect_metadata=True,
                      vxlan_learning=False) as vx:

examples/networking/tunnel_monitor/simulation.py

+../simulation.py
\ No newline at end of file