Merge branch 'pixie9' into master

mlakshkar · web-flow · commit 36310d2a1276 · 2026-04-09T17:49:54.000+05:30
Signed-off-by: Monu Lakshkar &lt;mlakshkar@newrelic.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,6 +99,11 @@ include(GNUInstallDirs)
 include(CheckCXXCompilerFlag)
 include(cmake/FindCompilerFlag.cmake)
 
+
+option(ENABLE_INTROSPECTIONS "Enable introspection tool" OFF)
+option(ENABLE_LUA "Enable lua bindings" OFF)
+option(ENABLE_PYTHON "Enable python binding" OFF)
+option(ENABLE_SHARED "Enable shared libraries" OFF)
 option(ENABLE_LLVM_NATIVECODEGEN "Enable use of llvm nativecodegen module (needed by rw-engine)" ON)
 option(ENABLE_RTTI "Enable compiling with real time type information" OFF)
 option(ENABLE_LLVM_SHARED "Enable linking LLVM as a shared library" OFF)
@@ -209,7 +214,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ${CXX_ISYSTEM_DIRS}")
 
 add_subdirectory(src)
-add_subdirectory(introspection)
+if(ENABLE_INTROSPECTIONS)
+  add_subdirectory(introspection)
+endif(ENABLE_INTROSPECTIONS)
 
 if(ENABLE_CLANG_JIT)
   if(ENABLE_EXAMPLES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,18 +4,24 @@
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
 if (ENABLE_RTTI)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -frtti")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -frtti")
 else()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if(NOT PYTHON_ONLY)
-add_subdirectory(cc)
+  add_subdirectory(cc)
 endif()
+
 if(ENABLE_CLANG_JIT)
-add_subdirectory(python)
-add_subdirectory(lua)
+  if(ENABLE_PYTHON)
+    add_subdirectory(python)
+  endif(ENABLE_PYTHON)
+
+  if(ENABLE_LUA)
+    add_subdirectory(lua)
+  endif(ENABLE_LUA)
 endif()
diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
@@ -3,9 +3,7 @@
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-# to be removed
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/frontends/b)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/frontends/b)
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/frontends/clang)
 include_directories(${LLVM_INCLUDE_DIRS})
 include_directories(${LIBELF_INCLUDE_DIRS})
@@ -15,6 +13,7 @@ endif(LIBLZMA_FOUND)
 if (LIBDEBUGINFOD_FOUND AND ENABLE_LIBDEBUGINFOD)
   include_directories(${LIBDEBUGINFOD_INCLUDE_DIRS})
 endif (LIBDEBUGINFOD_FOUND AND ENABLE_LIBDEBUGINFOD)
+
 # todo: if check for kernel version
 if (CMAKE_USE_LIBBPF_PACKAGE AND LIBBPF_FOUND)
   include_directories(${LIBBPF_INCLUDE_DIRS})
@@ -44,7 +43,8 @@ if (NOT HAVE_REALLOCARRAY_SUPPORT)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCOMPAT_NEED_REALLOCARRAY")
 endif()
 
-include(static_libstdc++)
+string(REGEX MATCH "^([0-9]+).*" _ ${LLVM_PACKAGE_VERSION})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}")
 
 if(LIBBPF_INCLUDE_DIR)
   # Add user libbpf include and notify compilation
@@ -88,11 +88,13 @@ if(LIBBPF_FOUND)
 endif()
 
 if(ENABLE_CLANG_JIT)
-add_library(bcc-shared SHARED
-  link_all.cc ${bcc_common_sources} ${bcc_table_sources} ${bcc_sym_sources}
-  ${bcc_util_sources})
-set_target_properties(bcc-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
-set_target_properties(bcc-shared PROPERTIES OUTPUT_NAME bcc)
+  if(ENABLE_SHARED)
+    add_library(bcc-shared SHARED
+      link_all.cc ${bcc_common_sources} ${bcc_table_sources} ${bcc_sym_sources}
+      ${bcc_util_sources})
+    set_target_properties(bcc-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
+    set_target_properties(bcc-shared PROPERTIES OUTPUT_NAME bcc)
+  endif(ENABLE_SHARED)
 
 if(ENABLE_USDT)
   add_definitions(-DEXPORT_USDT)
@@ -112,6 +114,8 @@ set(bpf_sources libbpf.c perf_reader.c ${libbpf_sources} ${bcc_sym_sources} ${bc
 add_library(bpf-static STATIC ${bpf_sources})
 set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf)
 target_link_libraries(bpf-static elf z)
+
+if(ENABLE_SHARED)
 add_library(bpf-shared SHARED ${bpf_sources})
 set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
 set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf)
@@ -125,6 +129,7 @@ endif(LIBDEBUGINFOD_FOUND)
 if(CMAKE_USE_LIBBPF_PACKAGE AND LIBBPF_FOUND)
   target_link_libraries(bpf-shared ${LIBBPF_LIBRARIES})
 endif()
+endif(ENABLE_SHARED)
 
 include(clang_libs)
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${clang_lib_exclude_flags}")
@@ -175,15 +180,25 @@ add_subdirectory(frontends)
 target_sources(bcc-static PRIVATE $<TARGET_OBJECTS:clang_frontend-objects>)
 
 # Link against LLVM libraries
-target_link_libraries(bcc-shared ${bcc_common_libs_for_s})
+if(ENABLE_SHARED)
+  target_link_libraries(bcc-shared ${bcc_common_libs_for_s})
+endif(ENABLE_SHARED)
+
 target_link_libraries(bcc-static ${bcc_common_libs_for_a} bcc-loader-static)
 set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua})
 
-install(TARGETS bcc-shared bcc-static bcc-loader-static bpf-static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS bcc-static bcc-loader-static bpf-static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install(FILES ${bcc_table_headers} DESTINATION include/bcc)
 install(FILES ${bcc_api_headers} DESTINATION include/bcc)
 install(DIRECTORY ${libbpf_uapi} DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+if(ENABLE_SHARED)
+  install(TARGETS bcc-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif(ENABLE_SHARED)
+
 endif(ENABLE_CLANG_JIT)
 install(FILES ${bcc_common_headers} DESTINATION include/bcc)
-install(TARGETS bpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if(ENABLE_SHARED)
+  install(TARGETS bpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif(ENABLE_SHARED)
diff --git a/src/cc/api/BPF.cc b/src/cc/api/BPF.cc
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <iostream>
 #include <memory>
+#include <random>
 #include <sstream>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/cc/api/BPF.h b/src/cc/api/BPF.h
@@ -409,6 +409,9 @@ class BPF {
   std::string all_bpf_program_;
 
   std::map<std::string, open_probe_t> kprobes_;
+  // For uprobes, if the binary path is longer than 250, we'll shorten them. And then keep the
+  // mapping.
+  std::map<std::string, std::string> name_map_;
   std::map<std::string, open_probe_t> uprobes_;
   std::map<std::string, open_probe_t> tracepoints_;
   std::map<std::string, open_probe_t> raw_tracepoints_;
diff --git a/src/cc/api/BPFTable.cc b/src/cc/api/BPFTable.cc
@@ -282,13 +282,19 @@ void BPFStackTable::free_symcache(int pid) {
   }
 }
 
+void BPFStackTable::clear_stack_id(int stack_id) {
+  if(stack_id >= 0) {
+    remove(&stack_id);
+  }
+}
+
 void BPFStackTable::clear_table_non_atomic() {
   for (int i = 0; size_t(i) < capacity(); i++) {
     remove(&i);
   }
 }
 
-std::vector<uintptr_t> BPFStackTable::get_stack_addr(int stack_id) {
+std::vector<uintptr_t> BPFStackTable::get_stack_addr(int stack_id, const bool clear) {
   std::vector<uintptr_t> res;
   stacktrace_t stack;
   if (stack_id < 0)
@@ -297,6 +303,10 @@ std::vector<uintptr_t> BPFStackTable::get_stack_addr(int stack_id) {
     return res;
   for (int i = 0; (i < BPF_MAX_STACK_DEPTH) && (stack.ip[i] != 0); i++)
     res.push_back(stack.ip[i]);
+
+  if (clear) {
+    clear_stack_id(stack_id);
+  }
   return res;
 }
 
@@ -326,6 +336,25 @@ std::vector<std::string> BPFStackTable::get_stack_symbol(int stack_id,
   return res;
 }
 
+std::string BPFStackTable::get_addr_symbol(uintptr_t addr, int pid) {
+  if (pid < 0)
+    pid = -1;
+  if (pid_sym_.find(pid) == pid_sym_.end())
+    pid_sym_[pid] = bcc_symcache_new(pid, &symbol_option_);
+  void* cache = pid_sym_[pid];
+
+  bcc_symbol symbol;
+  std::string sym_str;
+  if (bcc_symcache_resolve(cache, addr, &symbol) != 0) {
+    sym_str = "[UNKNOWN]";
+  } else {
+    sym_str = symbol.demangle_name;
+    bcc_symbol_free_demangle_name(&symbol);
+  }
+
+  return sym_str;
+}
+
 BPFStackBuildIdTable::BPFStackBuildIdTable(const TableDesc& desc, bool use_debug_file,
                                            bool check_debug_file_crc,
                                            void *bsymcache)
diff --git a/src/cc/api/BPFTable.h b/src/cc/api/BPFTable.h
@@ -300,9 +300,10 @@ class BPFHashTable : public BPFTableBase<KeyType, ValueType> {
     return value;
   }
 
-  std::vector<std::pair<KeyType, ValueType>> get_table_offline() {
+  std::vector<std::pair<KeyType, ValueType>> get_table_offline(const bool clear_table=false) {
     std::vector<std::pair<KeyType, ValueType>> res;
     KeyType cur;
+    KeyType prev;
     ValueType value;
 
     StatusTuple r(0);
@@ -315,8 +316,16 @@ class BPFHashTable : public BPFTableBase<KeyType, ValueType> {
       if (!r.ok())
         break;
       res.emplace_back(cur, value);
-      if (!this->next(&cur, &cur))
+      prev = cur;
+      if (!this->next(&cur, &cur)) {
+        if(clear_table) {
+          this->remove_value(prev);
+        }
         break;
+      }
+      if(clear_table) {
+        this->remove_value(prev);
+      }
     }
 
     return res;
@@ -380,8 +389,10 @@ class BPFStackTable : public BPFTableBase<int, stacktrace_t> {
 
   void free_symcache(int pid);
   void clear_table_non_atomic();
-  std::vector<uintptr_t> get_stack_addr(int stack_id);
+  void clear_stack_id(int stack_id);
+  std::vector<uintptr_t> get_stack_addr(int stack_id, const bool clear=false);
   std::vector<std::string> get_stack_symbol(int stack_id, int pid);
+  std::string get_addr_symbol(uintptr_t addr, int pid);
 
  private:
   bcc_symbol_option symbol_option_;
diff --git a/src/cc/api/CMakeLists.txt b/src/cc/api/CMakeLists.txt
@@ -2,3 +2,4 @@ set(bcc_api_sources BPF.cc BPFTable.cc)
 add_library(api-static STATIC ${bcc_api_sources})
 add_library(api-objects OBJECT ${bcc_api_sources})
 install(FILES BPF.h BPFTable.h COMPONENT libbcc DESTINATION include/bcc)
+install(TARGETS api-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/cc/bpffs_table.cc b/src/cc/bpffs_table.cc
@@ -32,6 +32,7 @@ class BpfFsTableStorage : public TableStorageImpl {
     virtual self_type &operator++() override;
     virtual value_type &operator*() const override;
     virtual pointer operator->() const override;
+    virtual bool operator!=(const self_type &rhs) const override;
   };
   virtual ~BpfFsTableStorage() {}
   virtual bool Find(const string &name, TableStorage::iterator &result) const override;
diff --git a/src/cc/frontends/clang/CMakeLists.txt b/src/cc/frontends/clang/CMakeLists.txt
@@ -11,3 +11,4 @@ endif()
 
 add_library(clang_frontend-objects OBJECT loader.cc b_frontend_action.cc tp_frontend_action.cc kbuild_helper.cc)
 add_library(clang_frontend STATIC $<TARGET_OBJECTS:clang_frontend-objects>)
+install(TARGETS clang_frontend ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
@@ -1233,7 +1233,7 @@ static int create_probe_event(char *buf, const char *ev_name,
     return -1;
   }
 
-  res = snprintf(ev_alias, sizeof(ev_alias), "%s_bcc_%d", ev_name, getpid());
+  res = snprintf(ev_alias, sizeof(ev_alias), "%s__pixie__%d", ev_name, getpid());
   if (res < 0 || res >= sizeof(ev_alias)) {
     fprintf(stderr, "Event name (%s) is too long for buffer\n", ev_name);
     close(kfd);
@@ -1422,7 +1422,7 @@ static int bpf_detach_probe(const char *ev_name, const char *event_type)
     goto error;
   }
 
-  res = snprintf(buf, sizeof(buf), "%ss/%s_bcc_%d", event_type, ev_name, getpid());
+  res = snprintf(buf, sizeof(buf), "%ss/%s__pixie__%d", event_type, ev_name, getpid());
   if (res < 0 || res >= sizeof(buf)) {
     fprintf(stderr, "snprintf(%s): %d\n", ev_name, res);
     goto error;
@@ -1447,7 +1447,7 @@ static int bpf_detach_probe(const char *ev_name, const char *event_type)
     goto error;
   }
 
-  res = snprintf(buf, sizeof(buf), "-:%ss/%s_bcc_%d", event_type, ev_name, getpid());
+  res = snprintf(buf, sizeof(buf), "-:%ss/%s__pixie__%d", event_type, ev_name, getpid());
   if (res < 0 || res >= sizeof(buf)) {
     fprintf(stderr, "snprintf(%s): %d\n", ev_name, res);
     goto error;
diff --git a/src/cc/perf_reader.c b/src/cc/perf_reader.c
@@ -172,8 +172,8 @@ void perf_reader_event_read(struct perf_reader *reader) {
   // Consume all the events on this ring, calling the cb function for each one.
   // The message may fall on the ring boundary, in which case copy the message
   // into a malloced buffer.
-  for (data_head = read_data_head(perf_header); perf_header->data_tail != data_head;
-      data_head = read_data_head(perf_header)) {
+  data_head = read_data_head(perf_header);
+  while (perf_header->data_tail != data_head) {
     uint64_t data_tail = perf_header->data_tail;
     uint8_t *ptr;
 
diff --git a/src/cc/shared_table.cc b/src/cc/shared_table.cc
@@ -43,6 +43,13 @@ class SharedTableStorage : public TableStorageImpl {
     }
     virtual value_type &operator*() const override { return *it_; }
     virtual pointer operator->() const override { return &*it_; }
+
+    // Introduce thsi function since the implementation of this class makes it very difficult to know
+    // if you are at the end of the map. Without this the iterator compare function sometimes accesses
+    // unallocated memory.
+    virtual bool operator!=(const self_type &rhs) const override {
+      return it_ != reinterpret_cast<const iterator*>(&rhs)->it_;
+    }
   };
   virtual ~SharedTableStorage() {}
   virtual bool Find(const string &name, TableStorage::iterator &result) const override;
diff --git a/src/cc/table_storage.cc b/src/cc/table_storage.cc
@@ -92,7 +92,8 @@ bool TableStorage::iterator::operator==(const iterator &rhs) const {
   return &**impl_ == &**rhs.impl_;
 }
 bool TableStorage::iterator::operator!=(const iterator &rhs) const {
-  return &**impl_ != &**rhs.impl_;
+  // See note in shared_table.cc operator !=.
+  return *impl_ != *rhs.impl_;
 }
 TableStorage::iterator::reference TableStorage::iterator::operator*() const { return **impl_; }
 TableStorage::iterator::pointer TableStorage::iterator::operator->() const { return &**impl_; }
diff --git a/src/cc/table_storage_impl.h b/src/cc/table_storage_impl.h
@@ -32,6 +32,7 @@ class TableStorageIteratorImpl {
   virtual value_type &operator*() const = 0;
   virtual pointer operator->() const = 0;
 
+  virtual bool operator!=(const self_type &rhs) const = 0;
  private:
 };
 
diff --git a/tests/cc/CMakeLists.txt b/tests/cc/CMakeLists.txt
@@ -46,6 +46,7 @@ set(TEST_LIBBCC_SOURCES
 	test_sock_table.cc
 	test_usdt_args.cc
 	test_usdt_probes.cc
+	test_perf_buffer_poll_full_ring_buf.cc
 	utils.cc
 	test_parse_tracepoint.cc
 	test_zip.cc)
@@ -100,7 +101,7 @@ if(NOT CMAKE_USE_LIBBPF_PACKAGE)
   add_executable(test_libbcc ${TEST_LIBBCC_SOURCES})
   add_dependencies(test_libbcc bcc-shared zip_archive ${DEBUGINFO_TARGETS})
 
-  target_link_libraries(test_libbcc ${PROJECT_BINARY_DIR}/src/cc/libbcc.so dl usdt_test_lib)
+  target_link_libraries(test_libbcc ${PROJECT_BINARY_DIR}/src/cc/libbcc.so dl usdt_test_lib pthread)
   set_target_properties(test_libbcc PROPERTIES INSTALL_RPATH ${PROJECT_BINARY_DIR}/src/cc)
   target_compile_definitions(test_libbcc PRIVATE -DLIBBCC_NAME=\"libbcc.so\")
 
@@ -111,7 +112,7 @@ if(LIBBPF_FOUND)
   add_executable(test_libbcc_no_libbpf ${TEST_LIBBCC_SOURCES})
   add_dependencies(test_libbcc_no_libbpf bcc-shared zip_archive ${DEBUGINFO_TARGETS})
 
-  target_link_libraries(test_libbcc_no_libbpf ${PROJECT_BINARY_DIR}/src/cc/libbcc.so dl usdt_test_lib ${LIBBPF_LIBRARIES})
+  target_link_libraries(test_libbcc_no_libbpf ${PROJECT_BINARY_DIR}/src/cc/libbcc.so dl usdt_test_lib ${LIBBPF_LIBRARIES} pthread)
   set_target_properties(test_libbcc_no_libbpf PROPERTIES INSTALL_RPATH ${PROJECT_BINARY_DIR}/src/cc)
   target_compile_definitions(test_libbcc_no_libbpf PRIVATE -DLIBBCC_NAME=\"libbcc.so\")
 
diff --git a/tests/cc/test_perf_buffer_poll_full_ring_buf.cc b/tests/cc/test_perf_buffer_poll_full_ring_buf.cc

Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,4 @@ endif()`
`11`	`11`
`12`	`12`	`add_library(clang_frontend-objects OBJECT loader.cc b_frontend_action.cc tp_frontend_action.cc kbuild_helper.cc)`
`13`	`13`	`add_library(clang_frontend STATIC $<TARGET_OBJECTS:clang_frontend-objects>)`
	`14`	`+install(TARGETS clang_frontend ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})`