varun-r-mallya/pylibbpf
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/pylibbpf.git synced 2026-02-12 16:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework BpfProgram.h, pass BpfObject as shared_ptr to BpfPrograms

Browse Source
This commit is contained in:
Pragyansh Chaturvedi
2025-10-18 12:36:15 +05:30
parent 763c188fa9
commit 2b99f01b02
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/bpf_object.cpp
View File

@ -206,7 +206,7 @@ std::shared_ptr<BpfMap> BpfObject::get_map(const std::string& name) {
// Create and cache // Create and cache
struct bpf_map *raw_map = find_map_by_name(name); struct bpf_map *raw_map = find_map_by_name(name);
auto map = std::make_shared<BpfMap>(this, raw_map, name); auto map = std::make_shared<BpfMap>(shared_from_this(), raw_map, name);
maps_cache_[name] = map; maps_cache_[name] = map;
return map; return map;
@ -227,7 +227,7 @@ std::shared_ptr<BpfMap> BpfObject::_get_or_create_map(struct bpf_map *map) {
} }
// Create and cache // Create and cache
auto bpf_map = std::make_shared<BpfMap>(this, map, map_name); auto bpf_map = std::make_shared<BpfMap>(shared_from_this(), map, map_name);
maps_cache_[map_name] = bpf_map; maps_cache_[map_name] = bpf_map;
return bpf_map; return bpf_map;

2
src/core/bpf_object.h
View File

@ -19,7 +19,7 @@ class BpfMap;
* This is the main entry point for loading BPF programs. * This is the main entry point for loading BPF programs.
* Owns the bpf_object* and manages all programs and maps within it. * Owns the bpf_object* and manages all programs and maps within it.
*/ */
class BpfObject { class BpfObject : public std::enable_shared_from_this<BpfObject> {
private: private:
struct bpf_object *obj_; struct bpf_object *obj_;
std::string object_path_; std::string object_path_;

21
src/core/bpf_program.h
View File

@ -3,36 +3,35 @@
#include <libbpf.h> #include <libbpf.h>
#include <pybind11/stl.h> #include <pybind11/stl.h>
#include <memory>
#include <string> #include <string>
namespace py = pybind11; class BpfObject;
class BpfProgram { class BpfProgram {
private: private:
struct bpf_object *obj_; std::weak_ptr<BpfObject> parent_obj_;
struct bpf_program *prog_; struct bpf_program *prog_;
struct bpf_link *link_; struct bpf_link *link_;
std::string object_path_;
std::string program_name_; std::string program_name_;
std::vector<std::pair<bpf_program *, bpf_link *> > programs;
public: public:
explicit BpfProgram(std::string object_path, std::string program_name = ""); explicit BpfProgram(std::shared_ptr<BpfObject> parent, struct bpf_program *raw_prog, std::string program_name = "");
~BpfProgram(); ~BpfProgram();
struct bpf_object *get_obj() const; BpfProgram(const BpfProgram&) = delete;
BpfProgram& operator=(const BpfProgram&) = delete;
bool load(); BpfProgram(BpfProgram&&) noexcept;
BpfProgram& operator=(BpfProgram&&) noexcept;
bool attach(); bool attach();
bool detach();
bool destroy();
void load_and_attach(); void load_and_attach();
[[nodiscard]] bool is_loaded() const { return obj_ != nullptr; }
[[nodiscard]] bool is_attached() const { return link_ != nullptr; } [[nodiscard]] bool is_attached() const { return link_ != nullptr; }
[[nodiscard]] std::string get_name() const { return program_name_; }
}; };
#endif //PYLIBBPF_BPF_PROGRAM_H #endif //PYLIBBPF_BPF_PROGRAM_H