diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2c9083..3972f3e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,13 +35,13 @@ repos: - id: requirements-txt-fixer - id: trailing-whitespace -#- repo: https://github.com/astral-sh/ruff-pre-commit -# rev: "v0.4.2" -# hooks: -# - id: ruff -# args: ["--fix", "--show-fixes"] -# - id: ruff-format -# exclude: ^(docs) +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: "v0.4.2" + hooks: + - id: ruff + args: ["--fix", "--show-fixes"] + - id: ruff-format + exclude: ^(docs) ## Checking static types #- repo: https://github.com/pre-commit/mirrors-mypy diff --git a/examples/clone_plot.py b/examples/clone_plot.py index e23982f..2888f22 100644 --- a/examples/clone_plot.py +++ b/examples/clone_plot.py @@ -3,7 +3,7 @@ from pythonbpf import bpf, map, section, bpfglobal, BPF from pythonbpf.helpers import pid from pythonbpf.maps import HashMap -from pylibbpf import * +from pylibbpf import BpfMap from ctypes import c_void_p, c_int64, c_uint64, c_int32 import matplotlib.pyplot as plt diff --git a/examples/struct_and_perf.py b/examples/struct_and_perf.py index 851f190..329d5ed 100644 --- a/examples/struct_and_perf.py +++ b/examples/struct_and_perf.py @@ -24,12 +24,13 @@ def events() -> PerfEventArray: def hello(ctx: c_void_p) -> c_int32: dataobj = data_t() ts = ktime() - process_id = pid() strobj = "hellohellohello" dataobj.pid = pid() dataobj.ts = ktime() # dataobj.comm = strobj - print(f"clone called at {dataobj.ts} by pid {dataobj.pid}, comm {strobj}") + print( + f"clone called at {dataobj.ts} by pid {dataobj.pid}, comm {strobj} at time {ts}" + ) events.output(dataobj) return c_int32(0) diff --git a/pythonbpf/__init__.py b/pythonbpf/__init__.py index e56aa06..022af1b 100644 --- a/pythonbpf/__init__.py +++ b/pythonbpf/__init__.py @@ -1,2 +1,13 @@ from .decorators import bpf, map, section, bpfglobal, struct from .codegen import compile_to_ir, compile, BPF + +__all__ = [ + "bpf", + "map", + "section", + "bpfglobal", + "struct", + "compile_to_ir", + "compile", + "BPF", +] diff --git a/pythonbpf/debuginfo/__init__.py b/pythonbpf/debuginfo/__init__.py index faeabe4..db3ff9c 100644 --- a/pythonbpf/debuginfo/__init__.py +++ b/pythonbpf/debuginfo/__init__.py @@ -1,3 +1,5 @@ -from .dwarf_constants import * -from .dtypes import * +from .dwarf_constants import * # noqa: F403 +from .dtypes import * # noqa: F403 from .debug_info_generator import DebugInfoGenerator + +__all__ = ["DebugInfoGenerator"] diff --git a/pythonbpf/functions_pass.py b/pythonbpf/functions_pass.py index 1835665..2aef65f 100644 --- a/pythonbpf/functions_pass.py +++ b/pythonbpf/functions_pass.py @@ -189,7 +189,7 @@ def handle_assign( map_name = rval.func.value.func.id method_name = rval.func.attr if map_name in map_sym_tab: - map_ptr = map_sym_tab[map_name] + # map_ptr = map_sym_tab[map_name] if method_name in helper_func_list: val = handle_helper_call( rval, @@ -289,7 +289,7 @@ def handle_if( ): """Handle if statements in the function body.""" print("Handling if statement") - start = builder.block.parent + # start = builder.block.parent then_block = func.append_basic_block(name="if.then") merge_block = func.append_basic_block(name="if.end") if stmt.orelse: @@ -674,7 +674,7 @@ def assign_string_to_array(builder, target_array_ptr, source_string_ptr, array_l Copy a string (i8*) to a fixed-size array ([N x i8]*) """ # Create a loop to copy characters one by one - entry_block = builder.block + # entry_block = builder.block copy_block = builder.append_basic_block("copy_char") end_block = builder.append_basic_block("copy_end") diff --git a/pythonbpf/maps/__init__.py b/pythonbpf/maps/__init__.py index 7893e14..370bbf2 100644 --- a/pythonbpf/maps/__init__.py +++ b/pythonbpf/maps/__init__.py @@ -1,2 +1,4 @@ from .maps import HashMap, PerfEventArray from .maps_pass import maps_proc + +__all__ = ["HashMap", "PerfEventArray", "maps_proc"] diff --git a/pythonbpf/structs/__init__.py b/pythonbpf/structs/__init__.py index 3b697e2..9dac561 100644 --- a/pythonbpf/structs/__init__.py +++ b/pythonbpf/structs/__init__.py @@ -1 +1,3 @@ from .structs_pass import structs_proc + +__all__ = ["structs_proc"] diff --git a/tests/failing_tests/binops.py b/tests/failing_tests/binops.py index 34260a1..3a86765 100644 --- a/tests/failing_tests/binops.py +++ b/tests/failing_tests/binops.py @@ -6,6 +6,7 @@ @section("sometag1") def sometag(ctx: c_void_p) -> c_int64: a = 1 + 2 + 1 + print(f"{a}") return c_int64(0) diff --git a/tests/failing_tests/license.py b/tests/failing_tests/license.py index 086fd68..9853ab7 100644 --- a/tests/failing_tests/license.py +++ b/tests/failing_tests/license.py @@ -7,6 +7,7 @@ @section("sometag1") def sometag(ctx: c_void_p) -> c_int64: a = 1 + 2 + print(f"{a}") return c_int64(0)