Make bytes_to_python const non-static

.github/workflows/pip.yml

@@ -1,29 +1,38 @@
 name: Pip
 
 on:
-  workflow_dispatch:
-  pull_request:
   push:
-    branches:
-      - master
-      - main
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+  workflow_dispatch:
 
 jobs:
-  build:
+  test:
+    name: Test on Python ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest]
-        python-version: ["3.8", "3.12"]
-
-    runs-on: ${{ matrix.platform }}
+        python-version: ['3.12', '3.13']
 
     steps:
-    - uses: actions/checkout@v5
+    - name: Checkout code
+      uses: actions/checkout@v5
       with:
-        submodules: true
+        submodules: recursive
 
-    - uses: actions/setup-python@v6
+    - name: Verify submodules
+      run: |
+        echo "Checking submodule status:"
+        git submodule status
+        echo "Checking libbpf directory:"
+        ls -la libbpf/
+        echo "Checking libbpf/src:"
+        ls -la libbpf/src/ || echo "libbpf/src not found!"
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -33,19 +42,72 @@ jobs:
         sudo apt-get install -y \
           libbpf-dev \
           libelf-dev \
-          linux-headers-generic \
+          zlib1g-dev \
           build-essential \
+          clang \
           cmake \
-          ninja-build
+          ninja-build \
+          pkg-config \
+          git \
+          make
 
-    - name: Add requirements
-      run: python -m pip install --upgrade pip wheel setuptools
+    - name: Install Python build dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade "setuptools>=77.0.0" wheel
+        pip install cmake ninja pybind11
 
-    - name: Build and install
-      run: pip install --verbose .[test]
+    - name: Check build requirements
+      run: |
+        echo "Python version:"
+        python --version
+        echo "CMake version:"
+        cmake --version
+        echo "Ninja version:"
+        ninja --version
+        echo "Setuptools version:"
+        python -c "import setuptools; print(setuptools.__version__)"
 
-    - name: Test import
-      run: python -I -c "import pylibbpf; print('Import successful')"
+    - name: Build and install pylibbpf (verbose)
+      run: |
+        pip install -v -e . 2>&1 | tee build.log
+      continue-on-error: false
 
-    - name: Test
-      run: python -I -m pytest -v
+    - name: Check build output
+      run: |
+        echo "Build directory contents:"
+        find build -type f -name "*.so" 2>/dev/null || echo "No .so files found in build/"
+        echo ""
+        echo "Looking for pylibbpf extension:"
+        find . -name "pylibbpf*.so" -o -name "pylibbpf*.pyd"
+        echo ""
+        echo "Site-packages contents:"
+        python -c "import site; print(site.getsitepackages())"
+        ls -la $(python -c "import site; print(site.getsitepackages()[0])")/pylibbpf/ || echo "pylibbpf not in site-packages"
+
+    - name: Try importing extension directly
+      run: |
+        python -c "
+        import sys
+        print('Python path:', sys.path)
+        try:
+            from pylibbpf import pylibbpf
+            print('Successfully imported pylibbpf.pylibbpf')
+            print('pylibbpf.pylibbpf members:', dir(pylibbpf))
+        except ImportError as e:
+            print(f'Failed to import pylibbpf.pylibbpf: {e}')
+        "
+
+    - name: Verify extension loaded
+      run: |
+        python -c "import pylibbpf; print('Members:', dir(pylibbpf)); assert hasattr(pylibbpf, 'BpfObject'), 'BpfObject not found!'; print('✓ OK')"
+
+    - name: Install test dependencies
+      if: success()
+      run: |
+        pip install pytest pytest-cov
+
+    - name: Run tests
+      if: success()
+      run: |
+        python -I -m pytest -v -s --cov=pylibbpf --cov-report=term-missing

.github/workflows/wheels.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build SDist
       run: pipx run build --sdist
@@ -41,22 +41,24 @@ jobs:
     steps:
     - uses: actions/checkout@v5
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build wheels
       uses: pypa/cibuildwheel@v3.2
       env:
         CIBW_PLATFORM: linux
         CIBW_ARCHS_LINUX: ${{ matrix.arch }}
-        CIBW_BUILD: "cp38-* cp311-*"
+        CIBW_BUILD: "cp312-* cp313-*"
         CIBW_SKIP: "*-musllinux*"
-        CIBW_TEST_COMMAND: "python -c 'import pylibbpf; print(f\"pylibbpf {pylibbpf.__version__} imported successfully\")'"
+        CIBW_TEST_COMMAND: "python -c 'import pylibbpf; assert hasattr(pylibbpf, \"BpfObject\"), \"BpfObject not found\"; print(f\"pylibbpf {pylibbpf.__version__} OK\")'"
         CIBW_TEST_SKIP: "*-linux_aarch64"
 
         CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
 
         CIBW_BEFORE_ALL_LINUX: |
-          dnf install -y elfutils-libelf-devel zlib-devel
+          dnf install -y elfutils-libelf-devel zlib-devel make gcc gcc-c++ git
+        CIBW_BEFORE_BUILD: >
+          pip install --upgrade "setuptools>=77.0.0" wheel cmake ninja pybind11
 
     - name: Verify clean directory
       run: git diff --exit-code

CMakeLists.txt

@@ -5,6 +5,11 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+find_package(
+  Python
+  COMPONENTS Interpreter Development.Module
+  REQUIRED)
+
 # pybind11
 include_directories(${CMAKE_SOURCE_DIR}/src)
 add_subdirectory(pybind11)

pylibbpf/ir_to_ctypes.py

@@ -1,6 +1,5 @@
 import ctypes
 import logging
-from typing import Dict, Type
 
 from llvmlite import ir
 
@@ -51,7 +50,7 @@ def _make_repr(struct_name: str, fields: list):
     return __repr__
 
 
-def convert_structs_to_ctypes(structs_sym_tab) -> Dict[str, Type[ctypes.Structure]]:
+def convert_structs_to_ctypes(structs_sym_tab) -> dict[str, type[ctypes.Structure]]:
     """Convert PythonBPF's structs_sym_tab to ctypes.Structure classes."""
     if not structs_sym_tab:
         return {}

pylibbpf/wrappers.py

@@ -1,4 +1,4 @@
-from typing import Callable, Optional
+from collections.abc import Callable
 
 
 class PerfEventArrayHelper:
@@ -13,7 +13,7 @@ class PerfEventArrayHelper:
         callback: Callable,
         struct_name: str = "",
         page_cnt: int = 8,
-        lost_callback: Optional[Callable] = None,
+        lost_callback: Callable | None = None,
     ):
         """Open perf buffer with auto-deserialization."""
         from .pylibbpf import PerfEventArray

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=42",
+    "setuptools>=77",
     "wheel",
     "ninja",
     "cmake>=4.0",
@@ -17,8 +17,8 @@ authors = [
     { name = "varun-r-mallya", email = "varunrmallya@gmail.com" }
 ]
 readme = "README.md"
-license = { file = "LICENSE" }
-requires-python = ">=3.8"
+license = "Apache-2.0"
+requires-python = ">=3.12"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
@@ -29,6 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: C++",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: System :: Operating System Kernels :: Linux",
@@ -47,7 +48,7 @@ Issues = "https://github.com/pythonbpf/pylibbpf/issues"
 
 [tool.mypy]
 files = "setup.py"
-python_version = "3.8"
+python_version = "3.12"
 strict = true
 show_error_codes = true
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
@@ -68,7 +69,7 @@ filterwarnings = [
 testpaths = ["tests"]
 
 [tool.ruff]
-target-version = "py38"
+target-version = "py312"
 line-length = 88
 
 [tool.ruff.lint]
@@ -79,3 +80,7 @@ extend-select = [
     "RUF", # Ruff-specific
     "UP", # pyupgrade
 ]
+
+[tool.setuptools]
+packages = ["pylibbpf"]
+package-data = {"pylibbpf" = ["*.py", "*.so", "*.pyd", "py.typed"]}

setup.py

@@ -3,17 +3,9 @@ import subprocess
 import sys
 from pathlib import Path
 
-from setuptools import Extension, find_packages, setup
+from setuptools import Extension, setup
 from setuptools.command.build_ext import build_ext
 
-# Convert distutils Windows platform specifiers to CMake -A arguments
-PLAT_TO_CMAKE = {
-    "win32": "Win32",
-    "win-amd64": "x64",
-    "win-arm32": "ARM",
-    "win-arm64": "ARM64",
-}
-
 
 # A CMakeExtension needs a sourcedir instead of a file list.
 # The name must be the _single_ output extension from the CMake build.
@@ -45,8 +37,8 @@ class CMakeBuild(build_ext):
         # from Python.
         cmake_args = [
             f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={extdir}{os.sep}",
-            f"-DPYTHON_EXECUTABLE={sys.executable}",
             f"-DCMAKE_BUILD_TYPE={cfg}",  # not used on MSVC, but no harm
+            f"-DPython_EXECUTABLE={sys.executable}",
         ]
         build_args = []
 
@@ -122,44 +114,6 @@ if readme_path.exists():
     long_description = readme_path.read_text(encoding="utf-8")
 
 setup(
-    name="pylibbpf",
-    version="0.0.1",
-    author="varun-r-mallya, r41k0u",
-    author_email="varunrmallyagmail.com",
-    description="Python Bindings for Libbpf",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/pythonbpf/pylibbpf",
-    packages=find_packages(where="."),
-    package_dir={"": "."},
-    py_modules=[],  # Empty since we use packages
     ext_modules=[CMakeExtension("pylibbpf.pylibbpf")],
     cmdclass={"build_ext": CMakeBuild},
-    zip_safe=False,
-    classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
-        "Operating System :: POSIX :: Linux",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: C++",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: System :: Operating System Kernels :: Linux",
-    ],
-    install_requires=[
-        "llvmlite>=0.40.0",  # Required for struct conversion
-    ],
-    extras_require={"test": ["pytest>=6.0"]},
-    python_requires=">=3.8",
-    package_data={
-        "pylibbpf": [
-            "*.py",
-            "py.typed",  # For type hints
-        ],
-    },
-    include_package_data=True,
 )

src/bindings/main.cpp

@@ -65,6 +65,10 @@ PYBIND11_MODULE(pylibbpf, m) {
       .def("get_key_size", &BpfMap::get_key_size)
       .def("get_value_size", &BpfMap::get_value_size)
       .def("get_max_entries", &BpfMap::get_max_entries)
+      .def("set_value_struct", &BpfMap::set_value_struct,
+           py::arg("struct_name"))
+      .def("get_value_struct_name", &BpfMap::get_value_struct_name)
+      .def("has_struct_value", &BpfMap::has_struct_value)
       .def("__getitem__", &BpfMap::lookup, py::arg("key"))
       .def("__setitem__", &BpfMap::update, py::arg("key"), py::arg("value"))
       .def("__delitem__", &BpfMap::delete_elem, py::arg("key"));

src/core/bpf_map.cpp

@@ -1,6 +1,7 @@
 #include "core/bpf_map.h"
 #include "core/bpf_exception.h"
 #include "core/bpf_object.h"
+#include "utils/struct_parser.h"
 #include <algorithm>
 #include <cerrno>
 #include <cstring>
@@ -25,6 +26,24 @@ BpfMap::BpfMap(std::shared_ptr<BpfObject> parent, struct bpf_map *raw_map,
   value_size_ = bpf_map__value_size(map_);
 }
 
+void BpfMap::set_value_struct(const std::string &struct_name) {
+  auto parent = parent_obj_.lock();
+  if (!parent) {
+    throw BpfException("Parent BpfObject no longer exists");
+  }
+
+  struct_parser_ = parent->get_struct_parser();
+  if (!struct_parser_) {
+    throw BpfException("No struct definitions available in BpfObject");
+  }
+
+  if (!struct_parser_->has_struct(struct_name)) {
+    throw BpfException("Unknown struct: " + struct_name);
+  }
+
+  value_struct_name_ = struct_name;
+}
+
 py::object BpfMap::lookup(const py::object &key) const {
   if (map_fd_ < 0)
     throw BpfException("Map '" + map_name_ + "' is not initialized properly");
@@ -42,7 +61,7 @@ py::object BpfMap::lookup(const py::object &key) const {
                                        value_span.data(), value_size_, BPF_ANY);
   if (ret < 0) {
     if (ret == -ENOENT)
-      throw py::key_error("Key not found in map '" + map_name_ + "'");
+      return py::none();
     throw BpfException("Failed to lookup key in map '" + map_name_ +
                        "': " + std::strerror(-ret));
   }
@@ -215,7 +234,13 @@ void BpfMap::python_to_bytes_inplace(const py::object &obj,
   }
 }
 
-py::object BpfMap::bytes_to_python(std::span<const uint8_t> data) {
+py::object BpfMap::bytes_to_python(std::span<const uint8_t> data) const {
+  //  NOTE: Struct parsing for value type
+  if (struct_parser_ && !value_struct_name_.empty()) {
+    py::bytes py_data(reinterpret_cast<const char *>(data.data()), data.size());
+    return struct_parser_->parse(value_struct_name_, py_data);
+  }
+
   if (data.size() == 4) {
     uint32_t value;
     std::memcpy(&value, data.data(), 4);

src/core/bpf_map.h

@@ -9,6 +9,7 @@
 #include <vector>
 
 class BpfObject;
+class StructParser;
 
 namespace py = pybind11;
 
@@ -20,6 +21,11 @@ private:
   std::string map_name_;
   __u32 key_size_, value_size_;
 
+  //  TODO: For now, we'll only support struct parsing for value types
+  // later we can extend this to keys
+  std::shared_ptr<StructParser> struct_parser_;
+  std::string value_struct_name_;
+
   template <size_t StackSize = 64> struct BufferManager {
     std::array<uint8_t, StackSize> stack_buf;
     std::vector<uint8_t> heap_buf;
@@ -52,6 +58,7 @@ public:
   py::dict items() const;
   py::list keys() const;
   py::list values() const;
+  void set_value_struct(const std::string &struct_name);
 
   [[nodiscard]] std::string get_name() const { return map_name_; }
   [[nodiscard]] int get_fd() const { return map_fd_; }
@@ -62,11 +69,17 @@ public:
   [[nodiscard]] std::shared_ptr<BpfObject> get_parent() const {
     return parent_obj_.lock();
   }
+  [[nodiscard]] std::string get_value_struct_name() const {
+    return value_struct_name_;
+  }
+  [[nodiscard]] bool has_struct_value() const {
+    return !value_struct_name_.empty();
+  }
 
 private:
   static void python_to_bytes_inplace(const py::object &obj,
                                       std::span<uint8_t> buffer);
-  static py::object bytes_to_python(std::span<const uint8_t> data);
+  py::object bytes_to_python(std::span<const uint8_t> data) const;
 };
 
 #endif // PYLIBBPF_BPF_MAP_H