Skip to content

Commit 929eef3

Browse files
committed
Add has_handler to HelperHandlerRegistry
1 parent 28cc0c5 commit 929eef3

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

pythonbpf/expr_pass.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ def eval_expr(func, module, builder, expr, local_sym_tab, map_sym_tab, structs_s
5050
return val, local_sym_tab[expr.args[0].id][1]
5151

5252
# check for helpers
53-
if expr.func.id in HelperHandlerRegistry._handlers:
53+
if HelperHandlerRegistry.has_handler(expr.func.id):
5454
return handle_helper_call(
5555
expr, module, builder, func, local_sym_tab, map_sym_tab, structs_sym_tab, local_var_metadata)
5656
elif isinstance(expr.func, ast.Attribute):
5757
print(f"Handling method call: {ast.dump(expr.func)}")
5858
if isinstance(expr.func.value, ast.Call) and isinstance(expr.func.value.func, ast.Name):
5959
method_name = expr.func.attr
60-
if method_name in HelperHandlerRegistry._handlers:
60+
if HelperHandlerRegistry.has_handler(method_name):
6161
return handle_helper_call(
6262
expr, module, builder, func, local_sym_tab, map_sym_tab, structs_sym_tab, local_var_metadata)
6363
elif isinstance(expr.func.value, ast.Name):
6464
obj_name = expr.func.value.id
6565
method_name = expr.func.attr
6666
if obj_name in map_sym_tab:
67-
if method_name in HelperHandlerRegistry._handlers:
67+
if HelperHandlerRegistry.has_handler(method_name):
6868
return handle_helper_call(
6969
expr, module, builder, func, local_sym_tab, map_sym_tab, structs_sym_tab, local_var_metadata)
7070
elif isinstance(expr, ast.Attribute):

pythonbpf/functions_pass.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def handle_assign(func, module, builder, stmt, map_sym_tab, local_sym_tab, struc
113113
print(f"Assigned {call_type} constant "
114114
f"{rval.args[0].value} to {var_name}")
115115
# local_sym_tab[var_name] = var
116-
elif call_type in HelperHandlerRegistry._handlers:
116+
elif HelperHandlerRegistry.has_handler(call_type):
117117
# var = builder.alloca(ir.IntType(64), name=var_name)
118118
# var.align = 8
119119
val = handle_helper_call(
@@ -154,7 +154,7 @@ def handle_assign(func, module, builder, stmt, map_sym_tab, local_sym_tab, struc
154154
method_name = rval.func.attr
155155
if map_name in map_sym_tab:
156156
map_ptr = map_sym_tab[map_name]
157-
if method_name in HelperHandlerRegistry._handlers:
157+
if HelperHandlerRegistry.has_handler(method_name):
158158
val = handle_helper_call(
159159
rval, module, builder, func, local_sym_tab, map_sym_tab, structs_sym_tab, local_var_metadata)
160160
# var = builder.alloca(ir.IntType(64), name=var_name)
@@ -344,7 +344,7 @@ def allocate_mem(module, builder, body, func, ret_type, map_sym_tab, local_sym_t
344344
var.align = ir_type.width // 8
345345
print(
346346
f"Pre-allocated variable {var_name} of type {call_type}")
347-
elif call_type in HelperHandlerRegistry._handlers:
347+
elif HelperHandlerRegistry.has_handler(call_type):
348348
# Assume return type is int64 for now
349349
ir_type = ir.IntType(64)
350350
var = builder.alloca(ir_type, name=var_name)

pythonbpf/helper/helper_utils.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ def get_handler(cls, helper_name):
2323
"""Get the handler function for a helper"""
2424
return cls._handlers.get(helper_name)
2525

26+
@classmethod
27+
def has_handler(cls, helper_name):
28+
"""Check if a handler function is registered for a helper"""
29+
return helper_name in cls._handlers
30+
2631

2732
def get_var_ptr_from_name(var_name, local_sym_tab):
2833
"""Get a pointer to a variable from the symbol table."""

0 commit comments

Comments
 (0)