varun-r-mallya/pylibbpf
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/pylibbpf.git synced 2026-03-23 13:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fill missing fields in BpfObject's move constructor

Browse Source
This commit is contained in:
Pragyansh Chaturvedi
2025-10-20 05:47:40 +05:30
parent 003495e833
commit 88716ce19a
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/bpf_object.cpp
View File

@ -4,6 +4,7 @@
#include "bpf_program.h" #include "bpf_program.h"
#include "utils/struct_parser.h" #include "utils/struct_parser.h"
#include <cerrno> #include <cerrno>
#include <utility>
BpfObject::BpfObject(std::string object_path, py::dict structs) BpfObject::BpfObject(std::string object_path, py::dict structs)
: obj_(nullptr), object_path_(std::move(object_path)), loaded_(false), : obj_(nullptr), object_path_(std::move(object_path)), loaded_(false),
@ -22,9 +23,13 @@ BpfObject::~BpfObject() {
} }
BpfObject::BpfObject(BpfObject &&other) noexcept BpfObject::BpfObject(BpfObject &&other) noexcept
: obj_(other.obj_), object_path_(std::move(other.object_path_)), : obj_(std::exchange(other.obj_, nullptr)),
loaded_(other.loaded_), prog_cache_(std::move(other.prog_cache_)), object_path_(std::move(other.object_path_)),
maps_cache_(std::move(other.maps_cache_)) { loaded_(std::exchange(other.loaded_, false)),
maps_cache_(std::move(other.maps_cache_)),
prog_cache_(std::move(other.prog_cache_)),
struct_defs_(std::move(other.struct_defs_)),
struct_parser_(std::move(other.struct_parser_)) {
other.obj_ = nullptr; other.obj_ = nullptr;
other.loaded_ = false; other.loaded_ = false;
@ -38,14 +43,13 @@ BpfObject &BpfObject::operator=(BpfObject &&other) noexcept {
bpf_object__close(obj_); bpf_object__close(obj_);
} }
obj_ = other.obj_; obj_ = std::exchange(other.obj_, nullptr);
object_path_ = std::move(other.object_path_); object_path_ = std::move(other.object_path_);
loaded_ = other.loaded_; loaded_ = std::exchange(other.loaded_, false);
prog_cache_ = std::move(other.prog_cache_);
maps_cache_ = std::move(other.maps_cache_); maps_cache_ = std::move(other.maps_cache_);
prog_cache_ = std::move(other.prog_cache_);
other.obj_ = nullptr; struct_defs_ = std::move(other.struct_defs_);
other.loaded_ = false; struct_parser_ = std::move(other.struct_parser_);
} }
return *this; return *this;
} }