From: Wander Lairson Costa <wander@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>,
Gabriele Monaco <gmonaco@redhat.com>,
Nam Cao <namcao@linutronix.de>,
Wander Lairson Costa <wander@redhat.com>,
linux-kernel@vger.kernel.org (open list),
linux-trace-kernel@vger.kernel.org (open list:RUNTIME
VERIFICATION (RV))
Subject: [PATCH 06/26] rv/rvgen: use context managers for file operations
Date: Mon, 19 Jan 2026 17:45:42 -0300 [thread overview]
Message-ID: <20260119205601.105821-7-wander@redhat.com> (raw)
In-Reply-To: <20260119205601.105821-1-wander@redhat.com>
Replace manual file open and close operations with context managers
throughout the rvgen codebase. The previous implementation used
explicit open() and close() calls, which could lead to resource leaks
if exceptions occurred between opening and closing the file handles.
This change affects three file operations: reading DOT specification
files in the automata parser, reading template files in the generator
base class, and writing generated monitor files. All now use the with
statement to ensure proper resource cleanup even in error conditions.
Context managers provide automatic cleanup through the with statement,
which guarantees that file handles are closed when the with block
exits regardless of whether an exception occurred. This follows PEP
343 recommendations and is the standard Python idiom for resource
management. The change also reduces code verbosity while improving
safety and maintainability.
Signed-off-by: Wander Lairson Costa <wander@redhat.com>
---
tools/verification/rvgen/rvgen/automata.py | 6 ++----
tools/verification/rvgen/rvgen/generator.py | 12 ++++--------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/tools/verification/rvgen/rvgen/automata.py b/tools/verification/rvgen/rvgen/automata.py
index ed02d0c69b410..70ff98abea751 100644
--- a/tools/verification/rvgen/rvgen/automata.py
+++ b/tools/verification/rvgen/rvgen/automata.py
@@ -51,13 +51,11 @@ class Automata:
cursor = 0
dot_lines = []
try:
- dot_file = open(self.__dot_path)
+ with open(self.__dot_path) as dot_file:
+ dot_lines = dot_file.read().splitlines()
except OSError as exc:
raise AutomataError(f"Cannot open the file: {self.__dot_path}") from exc
- dot_lines = dot_file.read().splitlines()
- dot_file.close()
-
# checking the first line:
line = dot_lines[cursor].split()
diff --git a/tools/verification/rvgen/rvgen/generator.py b/tools/verification/rvgen/rvgen/generator.py
index 6d16fb68798a7..ee75e111feef1 100644
--- a/tools/verification/rvgen/rvgen/generator.py
+++ b/tools/verification/rvgen/rvgen/generator.py
@@ -51,11 +51,8 @@ class RVGenerator:
raise FileNotFoundError("Could not find the rv directory, do you have the kernel source installed?")
def _read_file(self, path):
- fd = open(path, 'r')
-
- content = fd.read()
-
- fd.close()
+ with open(path, 'r') as fd:
+ content = fd.read()
return content
def _read_template_file(self, file):
@@ -199,9 +196,8 @@ obj-$(CONFIG_RV_MON_{name_up}) += monitors/{name}/{name}.o
return
def __write_file(self, file_name, content):
- file = open(file_name, 'w')
- file.write(content)
- file.close()
+ with open(file_name, 'w') as file:
+ file.write(content)
def _create_file(self, file_name, content):
path = f"{self.name}/{file_name}"
--
2.52.0
next prev parent reply other threads:[~2026-01-19 21:01 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-19 20:45 [PATCH 00/26] rv/rvgen: Robustness, modernization, and fixes Wander Lairson Costa
2026-01-19 20:45 ` [PATCH 01/26] rv/rvgen: introduce AutomataError exception class Wander Lairson Costa
2026-01-20 7:33 ` Gabriele Monaco
2026-01-20 12:39 ` Wander Lairson Costa
2026-01-20 15:08 ` Gabriele Monaco
2026-01-22 14:39 ` Nam Cao
2026-01-19 20:45 ` [PATCH 02/26] rv/rvgen: remove bare except clauses in generator Wander Lairson Costa
2026-01-20 10:05 ` Gabriele Monaco
2026-01-22 14:43 ` Nam Cao
2026-01-19 20:45 ` [PATCH 03/26] rv/rvgen: replace % string formatting with f-strings Wander Lairson Costa
2026-01-20 10:02 ` Gabriele Monaco
2026-01-22 14:46 ` Nam Cao
2026-01-19 20:45 ` [PATCH 04/26] rv/rvgen: replace __len__() calls with len() Wander Lairson Costa
2026-01-20 7:41 ` Gabriele Monaco
2026-01-22 14:46 ` Nam Cao
2026-01-19 20:45 ` [PATCH 05/26] rv/rvgen: remove unnecessary semicolons Wander Lairson Costa
2026-01-20 7:42 ` Gabriele Monaco
2026-01-22 14:47 ` Nam Cao
2026-01-19 20:45 ` Wander Lairson Costa [this message]
2026-01-20 7:44 ` [PATCH 06/26] rv/rvgen: use context managers for file operations Gabriele Monaco
2026-01-22 14:50 ` Nam Cao
2026-01-19 20:45 ` [PATCH 07/26] rv/rvgen: replace __contains__() with in operator Wander Lairson Costa
2026-01-20 7:45 ` Gabriele Monaco
2026-01-22 14:51 ` Nam Cao
2026-01-19 20:45 ` [PATCH 08/26] rv/rvgen: simplify boolean comparison Wander Lairson Costa
2026-01-20 7:48 ` Gabriele Monaco
2026-01-22 14:51 ` Nam Cao
2026-01-19 20:45 ` [PATCH 09/26] rv/rvgen: replace inline NotImplemented with decorator Wander Lairson Costa
2026-01-21 13:43 ` Gabriele Monaco
2026-01-21 17:49 ` Wander Lairson Costa
2026-01-22 14:57 ` Nam Cao
2026-01-19 20:45 ` [PATCH 10/26] rv/rvgen: fix typos in automata docstring and comments Wander Lairson Costa
2026-01-22 14:58 ` Nam Cao
2026-01-19 20:45 ` [PATCH 11/26] rv/rvgen: fix typo in generator module docstring Wander Lairson Costa
2026-01-20 7:51 ` Gabriele Monaco
2026-01-22 14:59 ` Nam Cao
2026-01-19 20:45 ` [PATCH 12/26] rv/rvgen: fix PEP 8 whitespace violations Wander Lairson Costa
2026-01-20 7:53 ` Gabriele Monaco
2026-01-22 14:59 ` Nam Cao
2026-01-19 20:45 ` [PATCH 13/26] rv/rvgen: fix DOT file validation logic error Wander Lairson Costa
2026-01-20 7:56 ` Gabriele Monaco
2026-01-22 15:01 ` Nam Cao
2026-01-19 20:45 ` [PATCH 14/26] rv/rvgen: remove redundant initial_state removal Wander Lairson Costa
2026-01-20 8:01 ` Gabriele Monaco
2026-01-20 12:05 ` Wander Lairson Costa
2026-01-19 20:45 ` [PATCH 15/26] rv/rvgen: use class constant for init marker Wander Lairson Costa
2026-01-20 8:06 ` Gabriele Monaco
2026-01-22 15:02 ` Nam Cao
2026-01-19 20:45 ` [PATCH 16/26] rv/rvgen: fix unbound initial_state variable Wander Lairson Costa
2026-01-20 8:21 ` Gabriele Monaco
2026-01-20 11:42 ` Wander Lairson Costa
2026-01-20 11:53 ` Gabriele Monaco
2026-01-19 20:45 ` [PATCH 17/26] rv/rvgen: fix possibly unbound variable in ltl2k Wander Lairson Costa
2026-01-20 8:59 ` Gabriele Monaco
2026-01-20 11:37 ` Wander Lairson Costa
2026-01-20 12:30 ` Gabriele Monaco
2026-01-20 19:38 ` Wander Lairson Costa
2026-01-21 6:31 ` Gabriele Monaco
2026-01-22 15:31 ` Nam Cao
2026-01-19 20:45 ` [PATCH 18/26] rv/rvgen: add fill_tracepoint_args_skel stub to ltl2k Wander Lairson Costa
2026-01-21 13:57 ` Gabriele Monaco
2026-01-21 17:53 ` Wander Lairson Costa
2026-01-22 13:10 ` Wander Lairson Costa
2026-01-22 13:49 ` Gabriele Monaco
2026-01-23 12:19 ` Wander Lairson Costa
2026-01-23 12:26 ` Gabriele Monaco
2026-01-23 14:04 ` Wander Lairson Costa
2026-01-19 20:45 ` [PATCH 19/26] rv/rvgen: add abstract method stubs to Container class Wander Lairson Costa
2026-01-21 13:59 ` Gabriele Monaco
2026-01-21 17:56 ` Wander Lairson Costa
2026-01-22 15:33 ` Nam Cao
2026-01-19 20:45 ` [PATCH 20/26] rv/rvgen: refactor automata.py to use iterator-based parsing Wander Lairson Costa
2026-01-20 9:43 ` Gabriele Monaco
2026-01-22 15:35 ` Nam Cao
2026-01-22 15:40 ` Gabriele Monaco
2026-01-22 16:01 ` Nam Cao
2026-01-19 20:45 ` [PATCH 21/26] rv/rvgen: remove unused sys import from dot2c Wander Lairson Costa
2026-01-20 9:16 ` Gabriele Monaco
2026-01-19 20:45 ` [PATCH 22/26] rv/rvgen: remove unused __get_main_name method Wander Lairson Costa
2026-01-20 9:08 ` Gabriele Monaco
2026-01-19 20:45 ` [PATCH 23/26] rv/rvgen: add type annotations to fix pyright errors Wander Lairson Costa
2026-01-22 15:43 ` Nam Cao
2026-01-19 20:46 ` [PATCH 24/26] rv/rvgen: make monitor arguments required in rvgen Wander Lairson Costa
2026-01-20 9:07 ` Gabriele Monaco
2026-01-22 15:44 ` Nam Cao
2026-01-19 20:46 ` [PATCH 25/26] rv/rvgen: fix isinstance check in Variable.expand() Wander Lairson Costa
2026-01-22 15:53 ` Nam Cao
2026-01-19 20:46 ` [PATCH 26/26] rv/rvgen: extract node marker string to class constant Wander Lairson Costa
2026-01-20 9:03 ` Gabriele Monaco
2026-01-20 11:34 ` Wander Lairson Costa
2026-01-20 12:36 ` Gabriele Monaco
2026-01-20 13:11 ` Gabriele Monaco
2026-01-20 18:56 ` Wander Lairson Costa
2026-01-21 6:16 ` Gabriele Monaco
2026-01-20 7:20 ` [PATCH 00/26] rv/rvgen: Robustness, modernization, and fixes Nam Cao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260119205601.105821-7-wander@redhat.com \
--to=wander@redhat.com \
--cc=gmonaco@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=namcao@linutronix.de \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox