Update pythonbpf/functions_pass.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.github/workflows/format.yml

@@ -5,10 +5,7 @@ name: Format
 
 on:
   workflow_dispatch:
-  pull_request:
   push:
-    branches:
-    - master
 
 jobs:
   pre-commit:

.pre-commit-config.yaml

@@ -41,16 +41,15 @@ repos:
     - id: ruff
       args: ["--fix", "--show-fixes"]
     - id: ruff-format
-      exclude: ^(docs)
+      exclude: ^(docs)|^(tests)|^(examples)
 
-## Checking static types
-#- repo: https://github.com/pre-commit/mirrors-mypy
-#  rev: "v1.10.0"
-#  hooks:
-#    - id: mypy
-#      files: "setup.py"
-#      args: []
-#      additional_dependencies: [types-setuptools]
+# Checking static types
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: "v1.10.0"
+  hooks:
+    - id: mypy
+      exclude: ^(tests)|^(examples)
+      additional_dependencies: [types-setuptools]
 
 # Changes tabs to spaces
 - repo: https://github.com/Lucas-C/pre-commit-hooks

README.md

@@ -60,12 +60,13 @@ pip install pythonbpf pylibbpf
 ```python
 import time
 from pythonbpf import bpf, map, section, bpfglobal, BPF
-from pythonbpf.helpers import pid
+from pythonbpf.helper import pid
 from pythonbpf.maps import HashMap
 from pylibbpf import *
 from ctypes import c_void_p, c_int64, c_uint64, c_int32
 import matplotlib.pyplot as plt
 
+
 # This program attaches an eBPF tracepoint to sys_enter_clone,
 # counts per-PID clone syscalls, stores them in a hash map,
 # and then plots the distribution as a histogram using matplotlib.
@@ -76,6 +77,7 @@ import matplotlib.pyplot as plt
 def hist() -> HashMap:
     return HashMap(key=c_int32, value=c_uint64, max_entries=4096)
 
+
 @bpf
 @section("tracepoint/syscalls/sys_enter_clone")
 def hello(ctx: c_void_p) -> c_int64:

examples/binops_demo.py

@@ -1,5 +1,5 @@
 from pythonbpf import bpf, map, section, bpfglobal, compile
-from pythonbpf.helpers import ktime
+from pythonbpf.helper import ktime
 from pythonbpf.maps import HashMap
 
 from ctypes import c_void_p, c_int64, c_uint64

examples/blk_request.py

@@ -1,5 +1,5 @@
 from pythonbpf import bpf, map, section, bpfglobal, compile
-from pythonbpf.helpers import ktime
+from pythonbpf.helper import ktime
 from pythonbpf.maps import HashMap
 
 from ctypes import c_void_p, c_int32, c_uint64

examples/clone-matplotlib.ipynb

@@ -10,7 +10,7 @@
     "import time\n",
     "\n",
     "from pythonbpf import bpf, map, section, bpfglobal, BPF\n",
-    "from pythonbpf.helpers import pid\n",
+    "from pythonbpf.helper import pid\n",
     "from pythonbpf.maps import HashMap\n",
     "from pylibbpf import *\n",
     "from ctypes import c_void_p, c_int64, c_uint64, c_int32\n",

examples/clone_plot.py

@@ -1,7 +1,7 @@
 import time
 
 from pythonbpf import bpf, map, section, bpfglobal, BPF
-from pythonbpf.helpers import pid
+from pythonbpf.helper import pid
 from pythonbpf.maps import HashMap
 from pylibbpf import BpfMap
 from ctypes import c_void_p, c_int64, c_uint64, c_int32

examples/struct_and_perf.py

@@ -1,5 +1,5 @@
 from pythonbpf import bpf, map, struct, section, bpfglobal, compile
-from pythonbpf.helpers import ktime, pid
+from pythonbpf.helper import ktime, pid
 from pythonbpf.maps import PerfEventArray
 
 from ctypes import c_void_p, c_int32, c_uint64
@@ -27,10 +27,7 @@ def hello(ctx: c_void_p) -> c_int32:
     dataobj.pid = pid()
     dataobj.ts = ktime()
     # dataobj.comm = strobj
-    print(
-        f"clone called at {dataobj.ts} by pid {
-            dataobj.pid}, comm {strobj} at time {ts}"
-    )
+    print(f"clone called at {dataobj.ts} by pid" f"{dataobj.pid}, comm {strobj}")
     events.output(dataobj)
     return c_int32(0)
 

examples/sys_sync.py

@@ -1,5 +1,5 @@
 from pythonbpf import bpf, map, section, bpfglobal, compile
-from pythonbpf.helpers import ktime
+from pythonbpf.helper import ktime
 from pythonbpf.maps import HashMap
 
 from ctypes import c_void_p, c_int64, c_uint64

examples/xdp_pass.py

@@ -1,5 +1,5 @@
 from pythonbpf import bpf, map, section, bpfglobal, compile
-from pythonbpf.helpers import XDP_PASS
+from pythonbpf.helper import XDP_PASS
 from pythonbpf.maps import HashMap
 
 from ctypes import c_void_p, c_int64

pythonbpf/binary_ops.py

@@ -25,7 +25,7 @@ def handle_binary_op(rval, module, builder, var_name, local_sym_tab, map_sym_tab
     # Handle left operand
     if isinstance(left, ast.Name):
         if left.id in local_sym_tab:
-            left = recursive_dereferencer(local_sym_tab[left.id][0], builder)
+            left = recursive_dereferencer(local_sym_tab[left.id].var, builder)
         else:
             raise SyntaxError(f"Undefined variable: {left.id}")
     elif isinstance(left, ast.Constant):
@@ -35,7 +35,7 @@ def handle_binary_op(rval, module, builder, var_name, local_sym_tab, map_sym_tab
 
     if isinstance(right, ast.Name):
         if right.id in local_sym_tab:
-            right = recursive_dereferencer(local_sym_tab[right.id][0], builder)
+            right = recursive_dereferencer(local_sym_tab[right.id].var, builder)
         else:
             raise SyntaxError(f"Undefined variable: {right.id}")
     elif isinstance(right, ast.Constant):
@@ -46,26 +46,26 @@ def handle_binary_op(rval, module, builder, var_name, local_sym_tab, map_sym_tab
     print(f"left is {left}, right is {right}, op is {op}")
 
     if isinstance(op, ast.Add):
-        builder.store(builder.add(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.add(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.Sub):
-        builder.store(builder.sub(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.sub(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.Mult):
-        builder.store(builder.mul(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.mul(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.Div):
-        builder.store(builder.sdiv(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.sdiv(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.Mod):
-        builder.store(builder.srem(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.srem(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.LShift):
-        builder.store(builder.shl(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.shl(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.RShift):
-        builder.store(builder.lshr(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.lshr(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.BitOr):
-        builder.store(builder.or_(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.or_(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.BitXor):
-        builder.store(builder.xor(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.xor(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.BitAnd):
-        builder.store(builder.and_(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.and_(left, right), local_sym_tab[var_name].var)
     elif isinstance(op, ast.FloorDiv):
-        builder.store(builder.udiv(left, right), local_sym_tab[var_name][0])
+        builder.store(builder.udiv(left, right), local_sym_tab[var_name].var)
     else:
         raise SyntaxError("Unsupported binary operation")

pythonbpf/codegen.py

@@ -141,7 +141,7 @@ def compile() -> bool:
     success = True
     success = compile_to_ir(str(caller_file), str(ll_file)) and success
 
-    success = (
+    success = bool(
         subprocess.run(
             [
                 "llc",

pythonbpf/expr_pass.py

@@ -10,15 +10,13 @@ def eval_expr(
     local_sym_tab,
     map_sym_tab,
     structs_sym_tab=None,
-    local_var_metadata=None,
 ):
     print(f"Evaluating expression: {ast.dump(expr)}")
-    print(local_var_metadata)
     if isinstance(expr, ast.Name):
         if expr.id in local_sym_tab:
-            var = local_sym_tab[expr.id][0]
+            var = local_sym_tab[expr.id].var
             val = builder.load(var)
-            return val, local_sym_tab[expr.id][1]  # return value and type
+            return val, local_sym_tab[expr.id].ir_type  # return value and type
         else:
             print(f"Undefined variable {expr.id}")
             return None
@@ -51,7 +49,7 @@ def eval_expr(
                     return None
                 if isinstance(arg, ast.Name):
                     if arg.id in local_sym_tab:
-                        arg = local_sym_tab[arg.id][0]
+                        arg = local_sym_tab[arg.id].var
                     else:
                         print(f"Undefined variable {arg.id}")
                         return None
@@ -60,7 +58,7 @@ def eval_expr(
                     return None
                 # Since we are handling only name case, directly take type from sym tab
                 val = builder.load(arg)
-                return val, local_sym_tab[expr.args[0].id][1]
+                return val, local_sym_tab[expr.args[0].id].ir_type
 
             # check for helpers
             if HelperHandlerRegistry.has_handler(expr.func.id):
@@ -72,7 +70,6 @@ def eval_expr(
                     local_sym_tab,
                     map_sym_tab,
                     structs_sym_tab,
-                    local_var_metadata,
                 )
         elif isinstance(expr.func, ast.Attribute):
             print(f"Handling method call: {ast.dump(expr.func)}")
@@ -89,7 +86,6 @@ def eval_expr(
                         local_sym_tab,
                         map_sym_tab,
                         structs_sym_tab,
-                        local_var_metadata,
                     )
             elif isinstance(expr.func.value, ast.Name):
                 obj_name = expr.func.value.id
@@ -104,24 +100,21 @@ def eval_expr(
                             local_sym_tab,
                             map_sym_tab,
                             structs_sym_tab,
-                            local_var_metadata,
                         )
     elif isinstance(expr, ast.Attribute):
         if isinstance(expr.value, ast.Name):
             var_name = expr.value.id
             attr_name = expr.attr
             if var_name in local_sym_tab:
-                var_ptr, var_type = local_sym_tab[var_name]
-                print(f"Loading attribute " f"{attr_name} from variable {var_name}")
+                var_ptr, var_type, var_metadata = local_sym_tab[var_name]
+                print(f"Loading attribute {attr_name} from variable {var_name}")
                 print(f"Variable type: {var_type}, Variable ptr: {var_ptr}")
-                print(local_var_metadata)
-                if local_var_metadata and var_name in local_var_metadata:
-                    metadata = structs_sym_tab[local_var_metadata[var_name]]
-                    if attr_name in metadata.fields:
-                        gep = metadata.gep(builder, var_ptr, attr_name)
-                        val = builder.load(gep)
-                        field_type = metadata.field_type(attr_name)
-                        return val, field_type
+                metadata = structs_sym_tab[var_metadata]
+                if attr_name in metadata.fields:
+                    gep = metadata.gep(builder, var_ptr, attr_name)
+                    val = builder.load(gep)
+                    field_type = metadata.field_type(attr_name)
+                    return val, field_type
     print("Unsupported expression evaluation")
     return None
 
@@ -134,11 +127,9 @@ def handle_expr(
     local_sym_tab,
     map_sym_tab,
     structs_sym_tab,
-    local_var_metadata,
 ):
     """Handle expression statements in the function body."""
     print(f"Handling expression: {ast.dump(expr)}")
-    print(local_var_metadata)
     call = expr.value
     if isinstance(call, ast.Call):
         eval_expr(
@@ -149,7 +140,6 @@ def handle_expr(
             local_sym_tab,
             map_sym_tab,
             structs_sym_tab,
-            local_var_metadata,
         )
     else:
         print("Unsupported expression type")

pythonbpf/functions_pass.py

@@ -1,13 +1,27 @@
 from llvmlite import ir
 import ast
-
+import logging
+from typing import Any
+from dataclasses import dataclass
 
 from .helper import HelperHandlerRegistry, handle_helper_call
 from .type_deducer import ctypes_to_ir
 from .binary_ops import handle_binary_op
 from .expr_pass import eval_expr, handle_expr
 
-local_var_metadata = {}
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class LocalSymbol:
+    var: ir.AllocaInstr
+    ir_type: ir.Type
+    metadata: Any = None
+
+    def __iter__(self):
+        yield self.var
+        yield self.ir_type
+        yield self.metadata
 
 
 def get_probe_string(func_node):
@@ -47,13 +61,12 @@ def handle_assign(
     if isinstance(target, ast.Attribute):
         # struct field assignment
         field_name = target.attr
-        if var_name in local_sym_tab and var_name in local_var_metadata:
-            struct_type = local_var_metadata[var_name]
+        if var_name in local_sym_tab:
+            struct_type = local_sym_tab[var_name].metadata
             struct_info = structs_sym_tab[struct_type]
-
             if field_name in struct_info.fields:
                 field_ptr = struct_info.gep(
-                    builder, local_sym_tab[var_name][0], field_name
+                    builder, local_sym_tab[var_name].var, field_name
                 )
                 val = eval_expr(
                     func,
@@ -83,21 +96,21 @@ def handle_assign(
     elif isinstance(rval, ast.Constant):
         if isinstance(rval.value, bool):
             if rval.value:
-                builder.store(ir.Constant(ir.IntType(1), 1),
-                              local_sym_tab[var_name][0])
+                builder.store(
+                    ir.Constant(ir.IntType(1), 1), local_sym_tab[var_name].var
+                )
             else:
-                builder.store(ir.Constant(ir.IntType(1), 0),
-                              local_sym_tab[var_name][0])
+                builder.store(
+                    ir.Constant(ir.IntType(1), 0), local_sym_tab[var_name].var
+                )
             print(f"Assigned constant {rval.value} to {var_name}")
         elif isinstance(rval.value, int):
             # Assume c_int64 for now
             # var = builder.alloca(ir.IntType(64), name=var_name)
             # var.align = 8
             builder.store(
-                ir.Constant(ir.IntType(64),
-                            rval.value), local_sym_tab[var_name][0]
+                ir.Constant(ir.IntType(64), rval.value), local_sym_tab[var_name].var
             )
-            # local_sym_tab[var_name] = var
             print(f"Assigned constant {rval.value} to {var_name}")
         elif isinstance(rval.value, str):
             str_val = rval.value.encode("utf-8") + b"\x00"
@@ -110,9 +123,8 @@ def handle_assign(
             global_str.linkage = "internal"
             global_str.global_constant = True
             global_str.initializer = str_const
-            str_ptr = builder.bitcast(
-                global_str, ir.PointerType(ir.IntType(8)))
-            builder.store(str_ptr, local_sym_tab[var_name][0])
+            str_ptr = builder.bitcast(global_str, ir.PointerType(ir.IntType(8)))
+            builder.store(str_ptr, local_sym_tab[var_name].var)
             print(f"Assigned string constant '{rval.value}' to {var_name}")
         else:
             print("Unsupported constant type")
@@ -130,14 +142,13 @@ def handle_assign(
                 # var = builder.alloca(ir_type, name=var_name)
                 # var.align = ir_type.width // 8
                 builder.store(
-                    ir.Constant(
-                        ir_type, rval.args[0].value), local_sym_tab[var_name][0]
+                    ir.Constant(ir_type, rval.args[0].value),
+                    local_sym_tab[var_name].var,
                 )
                 print(
                     f"Assigned {call_type} constant "
                     f"{rval.args[0].value} to {var_name}"
                 )
-                # local_sym_tab[var_name] = var
             elif HelperHandlerRegistry.has_handler(call_type):
                 # var = builder.alloca(ir.IntType(64), name=var_name)
                 # var.align = 8
@@ -149,10 +160,8 @@ def handle_assign(
                     local_sym_tab,
                     map_sym_tab,
                     structs_sym_tab,
-                    local_var_metadata,
                 )
-                builder.store(val[0], local_sym_tab[var_name][0])
-                # local_sym_tab[var_name] = var
+                builder.store(val[0], local_sym_tab[var_name].var)
                 print(f"Assigned constant {rval.func.id} to {var_name}")
             elif call_type == "deref" and len(rval.args) == 1:
                 print(f"Handling deref assignment {ast.dump(rval)}")
@@ -169,19 +178,15 @@ def handle_assign(
                     print("Failed to evaluate deref argument")
                     return
                 print(f"Dereferenced value: {val}, storing in {var_name}")
-                builder.store(val[0], local_sym_tab[var_name][0])
-                # local_sym_tab[var_name] = var
+                builder.store(val[0], local_sym_tab[var_name].var)
                 print(f"Dereferenced and assigned to {var_name}")
             elif call_type in structs_sym_tab and len(rval.args) == 0:
                 struct_info = structs_sym_tab[call_type]
                 ir_type = struct_info.ir_type
                 # var = builder.alloca(ir_type, name=var_name)
                 # Null init
-                builder.store(ir.Constant(ir_type, None),
-                              local_sym_tab[var_name][0])
-                local_var_metadata[var_name] = call_type
+                builder.store(ir.Constant(ir_type, None), local_sym_tab[var_name].var)
                 print(f"Assigned struct {call_type} to {var_name}")
-                # local_sym_tab[var_name] = var
             else:
                 print(f"Unsupported assignment call type: {call_type}")
         elif isinstance(rval.func, ast.Attribute):
@@ -204,12 +209,10 @@ def handle_assign(
                             local_sym_tab,
                             map_sym_tab,
                             structs_sym_tab,
-                            local_var_metadata,
                         )
                         # var = builder.alloca(ir.IntType(64), name=var_name)
                         # var.align = 8
-                        builder.store(val[0], local_sym_tab[var_name][0])
-                        # local_sym_tab[var_name] = var
+                        builder.store(val[0], local_sym_tab[var_name].var)
             else:
                 print("Unsupported assignment call structure")
         else:
@@ -233,7 +236,7 @@ def handle_cond(func, module, builder, cond, local_sym_tab, map_sym_tab):
             return None
     elif isinstance(cond, ast.Name):
         if cond.id in local_sym_tab:
-            var = local_sym_tab[cond.id][0]
+            var = local_sym_tab[cond.id].var
             val = builder.load(var)
             if val.type != ir.IntType(1):
                 # Convert nonzero values to true, zero to false
@@ -249,8 +252,7 @@ def handle_cond(func, module, builder, cond, local_sym_tab, map_sym_tab):
             print(f"Undefined variable {cond.id} in condition")
             return None
     elif isinstance(cond, ast.Compare):
-        lhs = eval_expr(func, module, builder, cond.left,
-                        local_sym_tab, map_sym_tab)[0]
+        lhs = eval_expr(func, module, builder, cond.left, local_sym_tab, map_sym_tab)[0]
         if len(cond.ops) != 1 or len(cond.comparators) != 1:
             print("Unsupported complex comparison")
             return None
@@ -303,8 +305,7 @@ def handle_if(
     else:
         else_block = None
 
-    cond = handle_cond(func, module, builder, stmt.test,
-                       local_sym_tab, map_sym_tab)
+    cond = handle_cond(func, module, builder, stmt.test, local_sym_tab, map_sym_tab)
     if else_block:
         builder.cbranch(cond, then_block, else_block)
     else:
@@ -350,7 +351,6 @@ def process_stmt(
 ):
     print(f"Processing statement: {ast.dump(stmt)}")
     if isinstance(stmt, ast.Expr):
-        print(local_var_metadata)
         handle_expr(
             func,
             module,
@@ -359,7 +359,6 @@ def process_stmt(
             local_sym_tab,
             map_sym_tab,
             structs_sym_tab,
-            local_var_metadata,
         )
     elif isinstance(stmt, ast.Assign):
         handle_assign(
@@ -409,6 +408,7 @@ def allocate_mem(
     module, builder, body, func, ret_type, map_sym_tab, local_sym_tab, structs_sym_tab
 ):
     for stmt in body:
+        has_metadata = False
         if isinstance(stmt, ast.If):
             if stmt.body:
                 local_sym_tab = allocate_mem(
@@ -449,8 +449,7 @@ def allocate_mem(
                         ir_type = ctypes_to_ir(call_type)
                         var = builder.alloca(ir_type, name=var_name)
                         var.align = ir_type.width // 8
-                        print(
-                            f"Pre-allocated variable {var_name} of type {call_type}")
+                        print(f"Pre-allocated variable {var_name} of type {call_type}")
                     elif HelperHandlerRegistry.has_handler(call_type):
                         # Assume return type is int64 for now
                         ir_type = ir.IntType(64)
@@ -467,10 +466,10 @@ def allocate_mem(
                         struct_info = structs_sym_tab[call_type]
                         ir_type = struct_info.ir_type
                         var = builder.alloca(ir_type, name=var_name)
-                        local_var_metadata[var_name] = call_type
+                        has_metadata = True
                         print(
-                            f"Pre-allocated variable {
-                                var_name} for struct {call_type}"
+                            f"Pre-allocated variable {var_name} "
+                            f"for struct {call_type}"
                         )
                 elif isinstance(rval.func, ast.Attribute):
                     ir_type = ir.PointerType(ir.IntType(64))
@@ -509,7 +508,11 @@ def allocate_mem(
             else:
                 print("Unsupported assignment value type")
                 continue
-            local_sym_tab[var_name] = (var, ir_type)
+
+            if has_metadata:
+                local_sym_tab[var_name] = LocalSymbol(var, ir_type, call_type)
+            else:
+                local_sym_tab[var_name] = LocalSymbol(var, ir_type)
     return local_sym_tab
 
 
@@ -665,14 +668,13 @@ def infer_return_type(func_node: ast.FunctionDef):
         except Exception:
             return type(e).__name__
 
-    for node in ast.walk(func_node):
-        if isinstance(node, ast.Return):
-            t = _expr_type(node.value)
+    for walked_node in ast.walk(func_node):
+        if isinstance(walked_node, ast.Return):
+            t = _expr_type(walked_node.value)
             if found_type is None:
                 found_type = t
             elif found_type != t:
-                raise ValueError("Conflicting return types:" f"{
-                                 found_type} vs {t}")
+                raise ValueError(f"Conflicting return types: {found_type} vs {t}")
     return found_type or "None"
 
 
@@ -709,8 +711,7 @@ def assign_string_to_array(builder, target_array_ptr, source_string_ptr, array_l
         char = builder.load(src_ptr)
 
         # Store character in target
-        dst_ptr = builder.gep(
-            target_array_ptr, [ir.Constant(ir.IntType(32), 0), idx])
+        dst_ptr = builder.gep(target_array_ptr, [ir.Constant(ir.IntType(32), 0), idx])
         builder.store(char, dst_ptr)
 
         # Increment counter
@@ -721,6 +722,5 @@ def assign_string_to_array(builder, target_array_ptr, source_string_ptr, array_l
 
     # Ensure null termination
     last_idx = ir.Constant(ir.IntType(32), array_length - 1)
-    null_ptr = builder.gep(
-        target_array_ptr, [ir.Constant(ir.IntType(32), 0), last_idx])
+    null_ptr = builder.gep(target_array_ptr, [ir.Constant(ir.IntType(32), 0), last_idx])
     builder.store(ir.Constant(ir.IntType(8), 0), null_ptr)

pythonbpf/helper/__init__.py

@@ -1,2 +1,13 @@
 from .helper_utils import HelperHandlerRegistry
 from .bpf_helper_handler import handle_helper_call
+from .helpers import ktime, pid, deref, XDP_DROP, XDP_PASS
+
+__all__ = [
+    "HelperHandlerRegistry",
+    "handle_helper_call",
+    "ktime",
+    "pid",
+    "deref",
+    "XDP_DROP",
+    "XDP_PASS",
+]

pythonbpf/helper/bpf_helper_handler.py

@@ -1,10 +1,14 @@
 import ast
 from llvmlite import ir
 from enum import Enum
-from .helper_utils import (HelperHandlerRegistry,
-                           get_or_create_ptr_from_arg, get_flags_val,
-                           handle_fstring_print, simple_string_print,
-                           get_data_ptr_and_size)
+from .helper_utils import (
+    HelperHandlerRegistry,
+    get_or_create_ptr_from_arg,
+    get_flags_val,
+    handle_fstring_print,
+    simple_string_print,
+    get_data_ptr_and_size,
+)
 
 
 class BPFHelperID(Enum):
@@ -18,9 +22,15 @@ class BPFHelperID(Enum):
 
 
 @HelperHandlerRegistry.register("ktime")
-def bpf_ktime_get_ns_emitter(call, map_ptr, module, builder, func,
-                             local_sym_tab=None, struct_sym_tab=None,
-                             local_var_metadata=None):
+def bpf_ktime_get_ns_emitter(
+    call,
+    map_ptr,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    struct_sym_tab=None,
+):
     """
     Emit LLVM IR for bpf_ktime_get_ns helper function call.
     """
@@ -34,27 +44,33 @@ def bpf_ktime_get_ns_emitter(call, map_ptr, module, builder, func,
 
 
 @HelperHandlerRegistry.register("lookup")
-def bpf_map_lookup_elem_emitter(call, map_ptr, module, builder, func,
-                                local_sym_tab=None, struct_sym_tab=None,
-                                local_var_metadata=None):
+def bpf_map_lookup_elem_emitter(
+    call,
+    map_ptr,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    struct_sym_tab=None,
+):
     """
     Emit LLVM IR for bpf_map_lookup_elem helper function call.
     """
     if not call.args or len(call.args) != 1:
-        raise ValueError("Map lookup expects exactly one argument (key), got "
-                         f"{len(call.args)}")
+        raise ValueError(
+            "Map lookup expects exactly one argument (key), got " f"{len(call.args)}"
+        )
     key_ptr = get_or_create_ptr_from_arg(call.args[0], builder, local_sym_tab)
     map_void_ptr = builder.bitcast(map_ptr, ir.PointerType())
 
     fn_type = ir.FunctionType(
         ir.PointerType(),  # Return type: void*
         [ir.PointerType(), ir.PointerType()],  # Args: (void*, void*)
-        var_arg=False
+        var_arg=False,
     )
     fn_ptr_type = ir.PointerType(fn_type)
 
-    fn_addr = ir.Constant(ir.IntType(
-        64), BPFHelperID.BPF_MAP_LOOKUP_ELEM.value)
+    fn_addr = ir.Constant(ir.IntType(64), BPFHelperID.BPF_MAP_LOOKUP_ELEM.value)
     fn_ptr = builder.inttoptr(fn_addr, fn_ptr_type)
 
     result = builder.call(fn_ptr, [map_void_ptr, key_ptr], tail=False)
@@ -63,33 +79,44 @@ def bpf_map_lookup_elem_emitter(call, map_ptr, module, builder, func,
 
 
 @HelperHandlerRegistry.register("print")
-def bpf_printk_emitter(call, map_ptr, module, builder, func,
-                       local_sym_tab=None, struct_sym_tab=None,
-                       local_var_metadata=None):
+def bpf_printk_emitter(
+    call,
+    map_ptr,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    struct_sym_tab=None,
+):
     """Emit LLVM IR for bpf_printk helper function call."""
     if not hasattr(func, "_fmt_counter"):
         func._fmt_counter = 0
 
     if not call.args:
-        raise ValueError(
-            "bpf_printk expects at least one argument (format string)")
+        raise ValueError("bpf_printk expects at least one argument (format string)")
 
     args = []
     if isinstance(call.args[0], ast.JoinedStr):
-        args = handle_fstring_print(call.args[0], module, builder, func,
-                                    local_sym_tab, struct_sym_tab,
-                                    local_var_metadata)
-    elif (isinstance(call.args[0], ast.Constant) and
-          isinstance(call.args[0].value, str)):
+        args = handle_fstring_print(
+            call.args[0],
+            module,
+            builder,
+            func,
+            local_sym_tab,
+            struct_sym_tab,
+        )
+    elif isinstance(call.args[0], ast.Constant) and isinstance(call.args[0].value, str):
         # TODO: We are only supporting single arguments for now.
         # In case of multiple args, the first one will be taken.
         args = simple_string_print(call.args[0].value, module, builder, func)
     else:
         raise NotImplementedError(
-            "Only simple strings or f-strings are supported in bpf_printk.")
+            "Only simple strings or f-strings are supported in bpf_printk."
+        )
 
     fn_type = ir.FunctionType(
-        ir.IntType(64), [ir.PointerType(), ir.IntType(32)], var_arg=True)
+        ir.IntType(64), [ir.PointerType(), ir.IntType(32)], var_arg=True
+    )
     fn_ptr_type = ir.PointerType(fn_type)
     fn_addr = ir.Constant(ir.IntType(64), BPFHelperID.BPF_PRINTK.value)
     fn_ptr = builder.inttoptr(fn_addr, fn_ptr_type)
@@ -99,18 +126,24 @@ def bpf_printk_emitter(call, map_ptr, module, builder, func,
 
 
 @HelperHandlerRegistry.register("update")
-def bpf_map_update_elem_emitter(call, map_ptr, module, builder, func,
-                                local_sym_tab=None, struct_sym_tab=None,
-                                local_var_metadata=None):
+def bpf_map_update_elem_emitter(
+    call,
+    map_ptr,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    struct_sym_tab=None,
+):
     """
     Emit LLVM IR for bpf_map_update_elem helper function call.
     Expected call signature: map.update(key, value, flags=0)
     """
-    if (not call.args or
-        len(call.args) < 2 or
-            len(call.args) > 3):
-        raise ValueError("Map update expects 2 or 3 args (key, value, flags), "
-                         f"got {len(call.args)}")
+    if not call.args or len(call.args) < 2 or len(call.args) > 3:
+        raise ValueError(
+            "Map update expects 2 or 3 args (key, value, flags), "
+            f"got {len(call.args)}"
+        )
 
     key_arg = call.args[0]
     value_arg = call.args[1]
@@ -124,12 +157,11 @@ def bpf_map_update_elem_emitter(call, map_ptr, module, builder, func,
     fn_type = ir.FunctionType(
         ir.IntType(64),
         [ir.PointerType(), ir.PointerType(), ir.PointerType(), ir.IntType(64)],
-        var_arg=False
+        var_arg=False,
     )
     fn_ptr_type = ir.PointerType(fn_type)
 
-    fn_addr = ir.Constant(ir.IntType(
-        64), BPFHelperID.BPF_MAP_UPDATE_ELEM.value)
+    fn_addr = ir.Constant(ir.IntType(64), BPFHelperID.BPF_MAP_UPDATE_ELEM.value)
     fn_ptr = builder.inttoptr(fn_addr, fn_ptr_type)
 
     if isinstance(flags_val, int):
@@ -138,22 +170,30 @@ def bpf_map_update_elem_emitter(call, map_ptr, module, builder, func,
         flags_const = flags_val
 
     result = builder.call(
-        fn_ptr, [map_void_ptr, key_ptr, value_ptr, flags_const], tail=False)
+        fn_ptr, [map_void_ptr, key_ptr, value_ptr, flags_const], tail=False
+    )
 
     return result, None
 
 
 @HelperHandlerRegistry.register("delete")
-def bpf_map_delete_elem_emitter(call, map_ptr, module, builder, func,
-                                local_sym_tab=None, struct_sym_tab=None,
-                                local_var_metadata=None):
+def bpf_map_delete_elem_emitter(
+    call,
+    map_ptr,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    struct_sym_tab=None,
+):
     """
     Emit LLVM IR for bpf_map_delete_elem helper function call.
     Expected call signature: map.delete(key)
     """
     if not call.args or len(call.args) != 1:
-        raise ValueError("Map delete expects exactly one argument (key), got "
-                         f"{len(call.args)}")
+        raise ValueError(
+            "Map delete expects exactly one argument (key), got " f"{len(call.args)}"
+        )
     key_ptr = get_or_create_ptr_from_arg(call.args[0], builder, local_sym_tab)
     map_void_ptr = builder.bitcast(map_ptr, ir.PointerType())
 
@@ -161,12 +201,11 @@ def bpf_map_delete_elem_emitter(call, map_ptr, module, builder, func,
     fn_type = ir.FunctionType(
         ir.IntType(64),  # Return type: int64 (status code)
         [ir.PointerType(), ir.PointerType()],  # Args: (void*, void*)
-        var_arg=False
+        var_arg=False,
     )
     fn_ptr_type = ir.PointerType(fn_type)
 
-    fn_addr = ir.Constant(ir.IntType(
-        64), BPFHelperID.BPF_MAP_DELETE_ELEM.value)
+    fn_addr = ir.Constant(ir.IntType(64), BPFHelperID.BPF_MAP_DELETE_ELEM.value)
     fn_ptr = builder.inttoptr(fn_addr, fn_ptr_type)
 
     result = builder.call(fn_ptr, [map_void_ptr, key_ptr], tail=False)
@@ -175,15 +214,20 @@ def bpf_map_delete_elem_emitter(call, map_ptr, module, builder, func,
 
 
 @HelperHandlerRegistry.register("pid")
-def bpf_get_current_pid_tgid_emitter(call, map_ptr, module, builder, func,
-                                     local_sym_tab=None, struct_sym_tab=None,
-                                     local_var_metadata=None):
+def bpf_get_current_pid_tgid_emitter(
+    call,
+    map_ptr,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    struct_sym_tab=None,
+):
     """
     Emit LLVM IR for bpf_get_current_pid_tgid helper function call.
     """
     # func is an arg to just have a uniform signature with other emitters
-    helper_id = ir.Constant(ir.IntType(
-        64), BPFHelperID.BPF_GET_CURRENT_PID_TGID.value)
+    helper_id = ir.Constant(ir.IntType(64), BPFHelperID.BPF_GET_CURRENT_PID_TGID.value)
     fn_type = ir.FunctionType(ir.IntType(64), [], var_arg=False)
     fn_ptr_type = ir.PointerType(fn_type)
     fn_ptr = builder.inttoptr(helper_id, fn_ptr_type)
@@ -196,18 +240,23 @@ def bpf_get_current_pid_tgid_emitter(call, map_ptr, module, builder, func,
 
 
 @HelperHandlerRegistry.register("output")
-def bpf_perf_event_output_handler(call, map_ptr, module, builder, func,
-                                  local_sym_tab=None, struct_sym_tab=None,
-                                  local_var_metadata=None):
+def bpf_perf_event_output_handler(
+    call,
+    map_ptr,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    struct_sym_tab=None,
+):
     if len(call.args) != 1:
-        raise ValueError("Perf event output expects exactly one argument, "
-                         f"got {len(call.args)}")
+        raise ValueError(
+            "Perf event output expects exactly one argument, " f"got {len(call.args)}"
+        )
     data_arg = call.args[0]
     ctx_ptr = func.args[0]  # First argument to the function is ctx
 
-    data_ptr, size_val = get_data_ptr_and_size(data_arg, local_sym_tab,
-                                               struct_sym_tab,
-                                               local_var_metadata)
+    data_ptr, size_val = get_data_ptr_and_size(data_arg, local_sym_tab, struct_sym_tab)
 
     # BPF_F_CURRENT_CPU is -1 in 32 bit
     flags_val = ir.Constant(ir.IntType(64), 0xFFFFFFFF)
@@ -216,36 +265,54 @@ def bpf_perf_event_output_handler(call, map_ptr, module, builder, func,
     data_void_ptr = builder.bitcast(data_ptr, ir.PointerType())
     fn_type = ir.FunctionType(
         ir.IntType(64),
-        [ir.PointerType(ir.IntType(8)), ir.PointerType(), ir.IntType(64),
-         ir.PointerType(), ir.IntType(64)],
-        var_arg=False
+        [
+            ir.PointerType(ir.IntType(8)),
+            ir.PointerType(),
+            ir.IntType(64),
+            ir.PointerType(),
+            ir.IntType(64),
+        ],
+        var_arg=False,
     )
     fn_ptr_type = ir.PointerType(fn_type)
 
     # helper id
-    fn_addr = ir.Constant(ir.IntType(64),
-                          BPFHelperID.BPF_PERF_EVENT_OUTPUT.value)
+    fn_addr = ir.Constant(ir.IntType(64), BPFHelperID.BPF_PERF_EVENT_OUTPUT.value)
     fn_ptr = builder.inttoptr(fn_addr, fn_ptr_type)
 
     result = builder.call(
-        fn_ptr,
-        [ctx_ptr, map_void_ptr, flags_val, data_void_ptr, size_val],
-        tail=False)
+        fn_ptr, [ctx_ptr, map_void_ptr, flags_val, data_void_ptr, size_val], tail=False
+    )
     return result, None
 
 
-def handle_helper_call(call, module, builder, func,
-                       local_sym_tab=None, map_sym_tab=None,
-                       struct_sym_tab=None, local_var_metadata=None):
+def handle_helper_call(
+    call,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    map_sym_tab=None,
+    struct_sym_tab=None,
+):
     """Process a BPF helper function call and emit the appropriate LLVM IR."""
+
     # Helper function to get map pointer and invoke handler
     def invoke_helper(method_name, map_ptr=None):
         handler = HelperHandlerRegistry.get_handler(method_name)
         if not handler:
             raise NotImplementedError(
-                f"Helper function '{method_name}' is not implemented.")
-        return handler(call, map_ptr, module, builder, func,
-                       local_sym_tab, struct_sym_tab, local_var_metadata)
+                f"Helper function '{method_name}' is not implemented."
+            )
+        return handler(
+            call,
+            map_ptr,
+            module,
+            builder,
+            func,
+            local_sym_tab,
+            struct_sym_tab,
+        )
 
     # Handle direct function calls (e.g., print(), ktime())
     if isinstance(call.func, ast.Name):
@@ -255,14 +322,18 @@ def handle_helper_call(call, module, builder, func,
     elif isinstance(call.func, ast.Attribute):
         method_name = call.func.attr
         value = call.func.value
-
+        print(f"Handling method call: {ast.dump(call.func)}")
         # Get map pointer from different styles of map access
         if isinstance(value, ast.Call) and isinstance(value.func, ast.Name):
-            # Variable style: my_map.lookup(key)
+            # Func style: my_map().lookup(key)
             map_name = value.func.id
+        elif isinstance(value, ast.Name):
+            # Direct style: my_map.lookup(key)
+            map_name = value.id
         else:
             raise NotImplementedError(
-                f"Unsupported map access pattern: {ast.dump(value)}")
+                f"Unsupported map access pattern: {ast.dump(value)}"
+            )
 
         # Verify map exists and get pointer
         if not map_sym_tab or map_name not in map_sym_tab:

pythonbpf/helper/helper_utils.py

@@ -1,5 +1,7 @@
 import ast
 import logging
+from collections.abc import Callable
+
 from llvmlite import ir
 from pythonbpf.expr_pass import eval_expr
 
@@ -8,14 +10,17 @@ logger = logging.getLogger(__name__)
 
 class HelperHandlerRegistry:
     """Registry for BPF helpers"""
-    _handlers = {}
+
+    _handlers: dict[str, Callable] = {}
 
     @classmethod
     def register(cls, helper_name):
         """Decorator to register a handler function for a helper"""
+
         def decorator(func):
             cls._handlers[helper_name] = func
             return func
+
         return decorator
 
     @classmethod
@@ -32,7 +37,7 @@ class HelperHandlerRegistry:
 def get_var_ptr_from_name(var_name, local_sym_tab):
     """Get a pointer to a variable from the symbol table."""
     if local_sym_tab and var_name in local_sym_tab:
-        return local_sym_tab[var_name][0]
+        return local_sym_tab[var_name].var
     raise ValueError(f"Variable '{var_name}' not found in local symbol table")
 
 
@@ -55,7 +60,8 @@ def get_or_create_ptr_from_arg(arg, builder, local_sym_tab):
         ptr = create_int_constant_ptr(arg.value, builder)
     else:
         raise NotImplementedError(
-            "Only simple variable names are supported as args in map helpers.")
+            "Only simple variable names are supported as args in map helpers."
+        )
     return ptr
 
 
@@ -66,16 +72,16 @@ def get_flags_val(arg, builder, local_sym_tab):
 
     if isinstance(arg, ast.Name):
         if local_sym_tab and arg.id in local_sym_tab:
-            flags_ptr = local_sym_tab[arg.id][0]
+            flags_ptr = local_sym_tab[arg.id].var
             return builder.load(flags_ptr)
         else:
-            raise ValueError(
-                f"Variable '{arg.id}' not found in local symbol table")
+            raise ValueError(f"Variable '{arg.id}' not found in local symbol table")
     elif isinstance(arg, ast.Constant) and isinstance(arg.value, int):
         return arg.value
 
     raise NotImplementedError(
-        "Only var names or int consts are supported as map helpers flags.")
+        "Only var names or int consts are supported as map helpers flags."
+    )
 
 
 def simple_string_print(string_value, module, builder, func):
@@ -87,9 +93,14 @@ def simple_string_print(string_value, module, builder, func):
     return args
 
 
-def handle_fstring_print(joined_str, module, builder, func,
-                         local_sym_tab=None, struct_sym_tab=None,
-                         local_var_metadata=None):
+def handle_fstring_print(
+    joined_str,
+    module,
+    builder,
+    func,
+    local_sym_tab=None,
+    struct_sym_tab=None,
+):
     """Handle f-string formatting for bpf_printk emitter."""
     fmt_parts = []
     exprs = []
@@ -100,25 +111,32 @@ def handle_fstring_print(joined_str, module, builder, func,
         if isinstance(value, ast.Constant):
             _process_constant_in_fstring(value, fmt_parts, exprs)
         elif isinstance(value, ast.FormattedValue):
-            _process_fval(value, fmt_parts, exprs,
-                          local_sym_tab, struct_sym_tab,
-                          local_var_metadata)
+            _process_fval(
+                value,
+                fmt_parts,
+                exprs,
+                local_sym_tab,
+                struct_sym_tab,
+            )
         else:
-            raise NotImplementedError(
-                f"Unsupported f-string value type: {type(value)}")
+            raise NotImplementedError(f"Unsupported f-string value type: {type(value)}")
 
     fmt_str = "".join(fmt_parts)
     args = simple_string_print(fmt_str, module, builder, func)
 
     # NOTE: Process expressions (limited to 3 due to BPF constraints)
     if len(exprs) > 3:
-        logger.warning(
-            "bpf_printk supports up to 3 args, extra args will be ignored.")
+        logger.warning("bpf_printk supports up to 3 args, extra args will be ignored.")
 
     for expr in exprs[:3]:
-        arg_value = _prepare_expr_args(expr, func, module, builder,
-                                       local_sym_tab, struct_sym_tab,
-                                       local_var_metadata)
+        arg_value = _prepare_expr_args(
+            expr,
+            func,
+            module,
+            builder,
+            local_sym_tab,
+            struct_sym_tab,
+        )
         args.append(arg_value)
 
     return args
@@ -133,61 +151,63 @@ def _process_constant_in_fstring(cst, fmt_parts, exprs):
         exprs.append(ir.Constant(ir.IntType(64), cst.value))
     else:
         raise NotImplementedError(
-            f"Unsupported constant type in f-string: {type(cst.value)}")
+            f"Unsupported constant type in f-string: {type(cst.value)}"
+        )
 
 
-def _process_fval(fval, fmt_parts, exprs,
-                  local_sym_tab, struct_sym_tab,
-                  local_var_metadata):
+def _process_fval(fval, fmt_parts, exprs, local_sym_tab, struct_sym_tab):
     """Process formatted values in f-string."""
     logger.debug(f"Processing formatted value: {ast.dump(fval)}")
 
     if isinstance(fval.value, ast.Name):
         _process_name_in_fval(fval.value, fmt_parts, exprs, local_sym_tab)
     elif isinstance(fval.value, ast.Attribute):
-        _process_attr_in_fval(fval.value, fmt_parts, exprs,
-                              local_sym_tab, struct_sym_tab,
-                              local_var_metadata)
+        _process_attr_in_fval(
+            fval.value,
+            fmt_parts,
+            exprs,
+            local_sym_tab,
+            struct_sym_tab,
+        )
     else:
         raise NotImplementedError(
-            f"Unsupported formatted value in f-string: {type(fval.value)}")
+            f"Unsupported formatted value in f-string: {type(fval.value)}"
+        )
 
 
 def _process_name_in_fval(name_node, fmt_parts, exprs, local_sym_tab):
     """Process name nodes in formatted values."""
     if local_sym_tab and name_node.id in local_sym_tab:
-        _, var_type = local_sym_tab[name_node.id]
+        _, var_type, tmp = local_sym_tab[name_node.id]
         _populate_fval(var_type, name_node, fmt_parts, exprs)
 
 
-def _process_attr_in_fval(attr_node, fmt_parts, exprs,
-                          local_sym_tab, struct_sym_tab,
-                          local_var_metadata):
+def _process_attr_in_fval(attr_node, fmt_parts, exprs, local_sym_tab, struct_sym_tab):
     """Process attribute nodes in formatted values."""
-    if (isinstance(attr_node.value, ast.Name) and
-            local_sym_tab and attr_node.value.id in local_sym_tab):
+    if (
+        isinstance(attr_node.value, ast.Name)
+        and local_sym_tab
+        and attr_node.value.id in local_sym_tab
+    ):
         var_name = attr_node.value.id
         field_name = attr_node.attr
 
-        if not local_var_metadata or var_name not in local_var_metadata:
-            raise ValueError(
-                f"Metadata for '{var_name}' not found in local var metadata")
-
-        var_type = local_var_metadata[var_name]
+        var_type = local_sym_tab[var_name].metadata
         if var_type not in struct_sym_tab:
             raise ValueError(
-                f"Struct '{var_type}' for '{var_name}' not in symbol table")
+                f"Struct '{var_type}' for '{var_name}' not in symbol table"
+            )
 
         struct_info = struct_sym_tab[var_type]
         if field_name not in struct_info.fields:
-            raise ValueError(
-                f"Field '{field_name}' not found in struct '{var_type}'")
+            raise ValueError(f"Field '{field_name}' not found in struct '{var_type}'")
 
         field_type = struct_info.field_type(field_name)
         _populate_fval(field_type, attr_node, fmt_parts, exprs)
     else:
         raise NotImplementedError(
-            "Only simple attribute on local vars is supported in f-strings.")
+            "Only simple attribute on local vars is supported in f-strings."
+        )
 
 
 def _populate_fval(ftype, node, fmt_parts, exprs):
@@ -202,14 +222,14 @@ def _populate_fval(ftype, node, fmt_parts, exprs):
             exprs.append(node)
         else:
             raise NotImplementedError(
-                f"Unsupported integer width in f-string: {ftype.width}")
+                f"Unsupported integer width in f-string: {ftype.width}"
+            )
     elif ftype == ir.PointerType(ir.IntType(8)):
         # NOTE: We assume i8* is a string
         fmt_parts.append("%s")
         exprs.append(node)
     else:
-        raise NotImplementedError(
-            f"Unsupported field type in f-string: {ftype}")
+        raise NotImplementedError(f"Unsupported field type in f-string: {ftype}")
 
 
 def _create_format_string_global(fmt_str, func, module, builder):
@@ -218,11 +238,11 @@ def _create_format_string_global(fmt_str, func, module, builder):
     func._fmt_counter += 1
 
     fmt_gvar = ir.GlobalVariable(
-        module, ir.ArrayType(ir.IntType(8), len(fmt_str)), name=fmt_name)
+        module, ir.ArrayType(ir.IntType(8), len(fmt_str)), name=fmt_name
+    )
     fmt_gvar.global_constant = True
     fmt_gvar.initializer = ir.Constant(
-        ir.ArrayType(ir.IntType(8), len(fmt_str)),
-        bytearray(fmt_str.encode("utf8"))
+        ir.ArrayType(ir.IntType(8), len(fmt_str)), bytearray(fmt_str.encode("utf8"))
     )
     fmt_gvar.linkage = "internal"
     fmt_gvar.align = 1
@@ -230,13 +250,17 @@ def _create_format_string_global(fmt_str, func, module, builder):
     return builder.bitcast(fmt_gvar, ir.PointerType())
 
 
-def _prepare_expr_args(expr, func, module, builder,
-                       local_sym_tab, struct_sym_tab,
-                       local_var_metadata):
+def _prepare_expr_args(expr, func, module, builder, local_sym_tab, struct_sym_tab):
     """Evaluate and prepare an expression to use as an arg for bpf_printk."""
-    val, _ = eval_expr(func, module, builder, expr,
-                       local_sym_tab, None, struct_sym_tab,
-                       local_var_metadata)
+    val, _ = eval_expr(
+        func,
+        module,
+        builder,
+        expr,
+        local_sym_tab,
+        None,
+        struct_sym_tab,
+    )
 
     if val:
         if isinstance(val.type, ir.PointerType):
@@ -246,43 +270,38 @@ def _prepare_expr_args(expr, func, module, builder,
                 val = builder.sext(val, ir.IntType(64))
         else:
             logger.warning(
-                "Only int and ptr supported in bpf_printk args. "
-                "Others default to 0.")
+                "Only int and ptr supported in bpf_printk args. " "Others default to 0."
+            )
             val = ir.Constant(ir.IntType(64), 0)
         return val
     else:
         logger.warning(
             "Failed to evaluate expression for bpf_printk argument. "
-            "It will be converted to 0.")
+            "It will be converted to 0."
+        )
         return ir.Constant(ir.IntType(64), 0)
 
 
-def get_data_ptr_and_size(data_arg, local_sym_tab, struct_sym_tab,
-                          local_var_metadata):
+def get_data_ptr_and_size(data_arg, local_sym_tab, struct_sym_tab):
     """Extract data pointer and size information for perf event output."""
     if isinstance(data_arg, ast.Name):
         data_name = data_arg.id
         if local_sym_tab and data_name in local_sym_tab:
-            data_ptr = local_sym_tab[data_name][0]
+            data_ptr = local_sym_tab[data_name].var
         else:
             raise ValueError(
-                f"Data variable {data_name} not found in local symbol table.")
+                f"Data variable {data_name} not found in local symbol table."
+            )
 
         # Check if data_name is a struct
-        if local_var_metadata and data_name in local_var_metadata:
-            data_type = local_var_metadata[data_name]
-            if data_type in struct_sym_tab:
-                struct_info = struct_sym_tab[data_type]
-                size_val = ir.Constant(ir.IntType(64), struct_info.size)
-                return data_ptr, size_val
-            else:
-                raise ValueError(
-                    f"Struct {data_type} for {data_name} not in symbol table.")
+        data_type = local_sym_tab[data_name].metadata
+        if data_type in struct_sym_tab:
+            struct_info = struct_sym_tab[data_type]
+            size_val = ir.Constant(ir.IntType(64), struct_info.size)
+            return data_ptr, size_val
         else:
-            raise ValueError(
-                f"Metadata for variable {data_name} "
-                "not found in local variable metadata.")
+            raise ValueError(f"Struct {data_type} for {data_name} not in symbol table.")
     else:
         raise NotImplementedError(
-            "Only simple object names are supported "
-            "as data in perf event output.")
+            "Only simple object names are supported as data in perf event output."
+        )

pythonbpf/maps/maps_pass.py

@@ -85,7 +85,7 @@ def create_bpf_map(module, map_name, map_params):
 
 
 def create_map_debug_info(module, map_global, map_name, map_params):
-    """Generate debug information metadata for BPF maps HASH and PERF_EVENT_ARRAY"""
+    """Generate debug info metadata for BPF maps HASH and PERF_EVENT_ARRAY"""
     generator = DebugInfoGenerator(module)
 
     uint_type = generator.get_uint32_type()
@@ -158,7 +158,8 @@ def create_ringbuf_debug_info(module, map_global, map_name, map_params):
     type_ptr = generator.create_pointer_type(type_array, 64)
     type_member = generator.create_struct_member("type", type_ptr, 0)
 
-    max_entries_array = generator.create_array_type(int_type, map_params["max_entries"])
+    max_entries_array = generator.create_array_type(
+        int_type, map_params["max_entries"])
     max_entries_ptr = generator.create_pointer_type(max_entries_array, 64)
     max_entries_member = generator.create_struct_member(
         "max_entries", max_entries_ptr, 64
@@ -166,7 +167,8 @@ def create_ringbuf_debug_info(module, map_global, map_name, map_params):
 
     elements_arr = [type_member, max_entries_member]
 
-    struct_type = generator.create_struct_type(elements_arr, 128, is_distinct=True)
+    struct_type = generator.create_struct_type(
+        elements_arr, 128, is_distinct=True)
 
     global_var = generator.create_global_var_debug_info(
         map_name, struct_type, is_local=False

pythonbpf/maps/maps_utils.py

@@ -1,7 +1,11 @@
+from collections.abc import Callable
+from typing import Any
+
+
 class MapProcessorRegistry:
     """Registry for map processor functions"""
 
-    _processors = {}
+    _processors: dict[str, Callable[..., Any]] = {}
 
     @classmethod
     def register(cls, map_type_name):

tests/failing_tests/direct_assign.py

@@ -1,5 +1,5 @@
 from pythonbpf import bpf, map, section, bpfglobal, compile
-from pythonbpf.helpers import XDP_PASS
+from pythonbpf.helper import XDP_PASS
 from pythonbpf.maps import HashMap
 
 from ctypes import c_void_p, c_int64

tests/passing_tests/perf_buffer_map.py

@@ -1,5 +1,5 @@
 from pythonbpf import bpf, map, struct, section, bpfglobal, compile, compile_to_ir, BPF
-from pythonbpf.helpers import ktime, pid
+from pythonbpf.helper import ktime, pid
 from pythonbpf.maps import PerfEventArray
 
 from ctypes import c_void_p, c_int32, c_uint64