Add bcc_version.h to access LIBBCC_VERSION from C/C++ (iovisor#2856)

add bcc/bcc_version.h to install
nanshuaibo · Apr 19, 2020 · 6d61622 · 6d61622
1 parent c1d3a65
commit 6d61622
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
@@ -1,6 +1,7 @@
 # Copyright (c) Facebook, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License")
 
+include_directories(${CMAKE_BINARY_DIR}/src/cc)
 include_directories(${CMAKE_SOURCE_DIR}/src/cc)
 include_directories(${CMAKE_SOURCE_DIR}/src/cc/api)
 include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)

diff --git a/examples/cpp/HelloWorld.cc b/examples/cpp/HelloWorld.cc
@@ -8,6 +8,7 @@
 #include <iostream>
 #include <string>
 
+#include "bcc_version.h"
 #include "BPF.h"
 
 const std::string BPF_PROGRAM = R"(
@@ -35,6 +36,8 @@ int main() {
  return 1;
  }
 
+ std::cout << "Starting HelloWorld with BCC " << LIBBCC_VERSION << std::endl;
+
  while (true) {
  if (std::getline(pipe, line)) {
  std::cout << line << std::endl;

diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
@@ -13,7 +13,8 @@ include_directories(${LIBELF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include/uapi)
 add_definitions(${LLVM_DEFINITIONS})
-configure_file(libbcc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc @ONLY)
+configure_file(libbcc.pc.in libbcc.pc @ONLY)
+configure_file(bcc_version.h.in bcc_version.h @ONLY)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DBCC_PROG_TAG_DIR='\"${BCC_PROG_TAG_DIR}\"'")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result")
@@ -66,7 +67,7 @@ endif()
 set(bcc_table_sources table_storage.cc shared_table.cc bpffs_table.cc json_map_decl_visitor.cc)
 set(bcc_util_sources common.cc)
 set(bcc_sym_sources bcc_syms.cc bcc_elf.c bcc_perf_map.c bcc_proc.c)
-set(bcc_common_headers libbpf.h perf_reader.h)
+set(bcc_common_headers libbpf.h perf_reader.h "${CMAKE_CURRENT_BINARY_DIR}/bcc_version.h")
 set(bcc_table_headers file_desc.h table_desc.h table_storage.h)
 set(bcc_api_headers bcc_common.h bpf_module.h bcc_exception.h bcc_syms.h bcc_proc.h bcc_elf.h)
 

diff --git a/src/cc/bcc_version.h.in b/src/cc/bcc_version.h.in
@@ -0,0 +1,6 @@
+#ifndef LIBBCC_VERSION_H
+#define LIBBCC_VERSION_H
+
+#define LIBBCC_VERSION "@REVISION@"
+
+#endif