Rename BpfPerfBuffer to PerfEventArray, add struct_parser to BpfObject as a shared_ptr

Author: r41k0u

CMakeLists.txt

@@ -21,8 +21,8 @@ pybind11_add_module(
   src/core/bpf_object.cpp
 
   # Maps
-  src/maps/bpf_perf_buffer.h
-  src/maps/bpf_perf_buffer.cpp
+  src/maps/perf_event_array.h
+  src/maps/perf_event_array.cpp
 
   # Utils
   src/utils/struct_parser.h

src/bindings/main.cpp

@@ -10,7 +10,7 @@ extern "C" {
 #include "core/bpf_program.h"
 #include "core/bpf_exception.h"
 #include "core/bpf_map.h"
-#include "maps/bpf_perf_buffer.h"
+#include "maps/perf_event_array.h"
 
 namespace py = pybind11;
 
@@ -66,14 +66,14 @@ PYBIND11_MODULE(pylibbpf, m) {
         .def("get_value_size", &BpfMap::get_value_size)
         .def("get_max_entries", &BpfMap::get_max_entries);
 
-    py::class_<BpfPerfBuffer>(m, "BpfPerfBuffer")
+    py::class_<PerfEventArray>(m, "PerfEventArray")
             .def(py::init<int, int, py::function, py::object>(),
                  py::arg("map_fd"),
                  py::arg("page_cnt") = 8,
                  py::arg("callback"),
                  py::arg("lost_callback") = py::none())
-            .def("poll", &BpfPerfBuffer::poll, py::arg("timeout_ms") = -1)
-            .def("consume", &BpfPerfBuffer::consume);
+            .def("poll", &PerfEventArray::poll, py::arg("timeout_ms") = -1)
+            .def("consume", &PerfEventArray::consume);
 
 
 #ifdef VERSION_INFO

src/core/bpf_object.cpp

@@ -2,11 +2,12 @@
 #include "bpf_exception.h"
 #include "bpf_map.h"
 #include "bpf_program.h"
+#include "utils/struct_parser.h"
 #include <cerrno>
 
 BpfObject::BpfObject(std::string object_path, py::dict structs)
     : obj_(nullptr), object_path_(std::move(object_path)), loaded_(false),
-      struct_defs_(structs) {}
+      struct_defs_(structs), struct_parser_(nullptr) {}
 
 BpfObject::~BpfObject() {
   // Clear caches first (order matters!)
@@ -256,3 +257,11 @@ py::dict BpfObject::get_cached_maps() const {
   }
   return maps;
 }
+
+std::shared_ptr<StructParser> BpfObject::get_struct_parser() const {
+    if (!struct_parser_ && !struct_defs_.empty()) {
+        // Create parser on first access
+        struct_parser_ = std::make_shared<StructParser>(struct_defs_);
+    }
+    return struct_parser_;
+}

src/core/bpf_object.h

@@ -12,6 +12,7 @@ namespace py = pybind11;
 
 class BpfProgram;
 class BpfMap;
+class StructParser;
 
 /**
  * BpfObject - Represents a loaded BPF object file.
@@ -29,6 +30,7 @@ class BpfObject : public std::enable_shared_from_this<BpfObject> {
   mutable std::unordered_map<std::string, std::shared_ptr<BpfProgram>>
       prog_cache_;
   py::dict struct_defs_;
+  mutable std::shared_ptr<StructParser> struct_parser_;
 
   std::shared_ptr<BpfProgram> _get_or_create_program(struct bpf_program *prog);
   std::shared_ptr<BpfMap> _get_or_create_map(struct bpf_map *map);
@@ -78,6 +80,10 @@ class BpfObject : public std::enable_shared_from_this<BpfObject> {
   [[nodiscard]] std::shared_ptr<BpfMap> get_map(const std::string &name);
   [[nodiscard]] struct bpf_map *find_map_by_name(const std::string &name) const;
   [[nodiscard]] py::dict get_cached_maps() const;
+
+  // Struct parsing
+  [[nodiscard]] py::dict get_struct_defs() const { return struct_defs_; }
+  [[nodiscard]] std::shared_ptr<StructParser> get_struct_parser() const;
 };
 
 #endif // PYLIBBPF_BPF_OBJECT_H

src/maps/bpf_perf_buffer.h

@@ -1,31 +1,37 @@
-#ifndef PYLIBBPF_BPF_PERF_BUFFER_H
-#define PYLIBBPF_BPF_PERF_BUFFER_H
+#ifndef PYLIBBPF_PERF_EVENT_ARRAY_H
+#define PYLIBBPF_PERF_EVENT_ARRAY_H
 
 #include <libbpf.h>
 #include <pybind11/functional.h>
 #include <pybind11/pybind11.h>
+#include <string>
+
+class StructParser;
 
 namespace py = pybind11;
 
-class BpfPerfBuffer {
+class PerfEventArray {
 private:
   struct perf_buffer *pb_;
   py::function callback_;
   py::function lost_callback_;
 
+  std::shared_ptr<StructParser> parser_;
+  std::string struct_name_;
+
   // Static callback wrappers for C API
   static void sample_callback_wrapper(void *ctx, int cpu, void *data,
                                       unsigned int size);
   static void lost_callback_wrapper(void *ctx, int cpu, unsigned long long cnt);
 
 public:
-  BpfPerfBuffer(int map_fd, int page_cnt, py::function callback,
+  PerfEventArray(int map_fd, int page_cnt, py::function callback,
                 py::object lost_callback = py::none());
-  ~BpfPerfBuffer();
+  ~PerfEventArray();
 
   int poll(int timeout_ms);
   int consume();
   [[nodiscard]] int fd() const;
 };
 
-#endif // PYLIBBPF_BPF_PERF_BUFFER_H
+#endif // PYLIBBPF_PERF_EVENT_ARRAY_H

src/maps/bpf_perf_buffer.cpp renamed to src/maps/perf_event_array.cpp

@@ -1,7 +1,7 @@
-#include "bpf_perf_buffer.h"
+#include "perf_event_array.h"
 #include "core/bpf_exception.h"
 
-BpfPerfBuffer::BpfPerfBuffer(int map_fd, int page_cnt, py::function callback,
+PerfEventArray::PerfEventArray(int map_fd, int page_cnt, py::function callback,
                              py::object lost_callback)
     : pb_(nullptr), callback_(std::move(callback)),
       lost_callback_(lost_callback) {
@@ -27,15 +27,15 @@ BpfPerfBuffer::BpfPerfBuffer(int map_fd, int page_cnt, py::function callback,
   }
 }
 
-BpfPerfBuffer::~BpfPerfBuffer() {
+PerfEventArray::~PerfEventArray() {
   if (pb_) {
     perf_buffer__free(pb_);
   }
 }
 
-void BpfPerfBuffer::sample_callback_wrapper(void *ctx, int cpu, void *data,
+void PerfEventArray::sample_callback_wrapper(void *ctx, int cpu, void *data,
                                             unsigned int size) {
-  auto *self = static_cast<BpfPerfBuffer *>(ctx);
+  auto *self = static_cast<PerfEventArray *>(ctx);
 
   // Acquire GIL for Python calls
   py::gil_scoped_acquire acquire;
@@ -51,9 +51,9 @@ void BpfPerfBuffer::sample_callback_wrapper(void *ctx, int cpu, void *data,
   }
 }
 
-void BpfPerfBuffer::lost_callback_wrapper(void *ctx, int cpu,
+void PerfEventArray::lost_callback_wrapper(void *ctx, int cpu,
                                           unsigned long long cnt) {
-  auto *self = static_cast<BpfPerfBuffer *>(ctx);
+  auto *self = static_cast<PerfEventArray *>(ctx);
 
   if (self->lost_callback_.is_none()) {
     return;
@@ -68,13 +68,13 @@ void BpfPerfBuffer::lost_callback_wrapper(void *ctx, int cpu,
   }
 }
 
-int BpfPerfBuffer::poll(int timeout_ms) {
+int PerfEventArray::poll(int timeout_ms) {
   // Release GIL during blocking poll
   py::gil_scoped_release release;
   return perf_buffer__poll(pb_, timeout_ms);
 }
 
-int BpfPerfBuffer::consume() {
+int PerfEventArray::consume() {
   py::gil_scoped_release release;
   return perf_buffer__consume(pb_);
 }

src/maps/perf_event_array.h

@@ -0,0 +1,37 @@
+#ifndef PYLIBBPF_BPF_PERF_BUFFER_H
+#define PYLIBBPF_BPF_PERF_BUFFER_H
+
+#include <libbpf.h>
+#include <pybind11/functional.h>
+#include <pybind11/pybind11.h>
+#include <string>
+
+class StructParser;
+
+namespace py = pybind11;
+
+class PerfEventArray {
+private:
+  struct perf_buffer *pb_;
+  py::function callback_;
+  py::function lost_callback_;
+
+  std::shared_ptr<StructParser> parser_;
+  std::string struct_name_;
+
+  // Static callback wrappers for C API
+  static void sample_callback_wrapper(void *ctx, int cpu, void *data,
+                                      unsigned int size);
+  static void lost_callback_wrapper(void *ctx, int cpu, unsigned long long cnt);
+
+public:
+  PerfEventArray(int map_fd, int page_cnt, py::function callback,
+                py::object lost_callback = py::none());
+  ~PerfEventArray();
+
+  int poll(int timeout_ms);
+  int consume();
+  [[nodiscard]] int fd() const;
+};
+
+#endif // PYLIBBPF_BPF_PERF_BUFFER_H