mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Gabriele Monaco <gmonaco@redhat.com>
To: linux-kernel@vger.kernel.org,
	Steven Rostedt <rostedt@goodmis.org>,
	Nam Cao <namcao@linutronix.de>,
	Gabriele Monaco <gmonaco@redhat.com>,
	linux-trace-kernel@vger.kernel.org
Cc: Tomas Glozar <tglozar@redhat.com>, Juri Lelli <jlelli@redhat.com>,
	Clark Williams <williams@redhat.com>,
	John Kacur <jkacur@redhat.com>
Subject: [PATCH v3 03/13] verification/rvgen: Allow spaces in and events strings
Date: Fri,  5 Dec 2025 14:16:11 +0100	[thread overview]
Message-ID: <20251205131621.135513-4-gmonaco@redhat.com> (raw)
In-Reply-To: <20251205131621.135513-1-gmonaco@redhat.com>

Currently the automata parser assumes event strings don't have any
space, this stands true for event names, but can be a wrong assumption
if we want to store other information in the event strings (e.g.
constraints for hybrid automata).

Adapt the parser logic to allow spaces in the event strings.

Reviewed-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
---
 tools/verification/rvgen/rvgen/automata.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/verification/rvgen/rvgen/automata.py b/tools/verification/rvgen/rvgen/automata.py
index 3f06aef8d4fd..977ba859c34e 100644
--- a/tools/verification/rvgen/rvgen/automata.py
+++ b/tools/verification/rvgen/rvgen/automata.py
@@ -127,14 +127,13 @@ class Automata:
             #  ------------ event is here ------------^^^^^
             if self.__dot_lines[cursor].split()[1] == "->":
                 line = self.__dot_lines[cursor].split()
-                event = line[-2].replace('"','')
+                event = "".join(line[line.index("label")+2:-1]).replace('"','')
 
                 # when a transition has more than one lables, they are like this
                 # "local_irq_enable\nhw_local_irq_enable_n"
                 # so split them.
 
-                event = event.replace("\\n", " ")
-                for i in event.split():
+                for i in event.split("\\n"):
                     events.append(i)
             cursor += 1
 
@@ -167,8 +166,8 @@ class Automata:
                 line = self.__dot_lines[cursor].split()
                 origin_state = line[0].replace('"','').replace(',','_')
                 dest_state = line[2].replace('"','').replace(',','_')
-                possible_events = line[-2].replace('"','').replace("\\n", " ")
-                for event in possible_events.split():
+                possible_events = "".join(line[line.index("label")+2:-1]).replace('"','')
+                for event in possible_events.split("\\n"):
                     matrix[states_dict[origin_state]][events_dict[event]] = dest_state
             cursor += 1
 
-- 
2.52.0


  parent reply	other threads:[~2025-12-05 13:16 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-05 13:16 [PATCH v3 00/13] rv: Add Hybrid Automata monitor type, per-object and deadline monitors Gabriele Monaco
2025-12-05 13:16 ` [PATCH v3 01/13] rv: Unify DA event handling functions across monitor types Gabriele Monaco
2025-12-18  1:04   ` Nam Cao
2025-12-22 14:45     ` Gabriele Monaco
2025-12-05 13:16 ` [PATCH v3 02/13] rv: Add Hybrid Automata monitor type Gabriele Monaco
2025-12-18  5:57   ` Nam Cao
2025-12-22 15:26     ` Gabriele Monaco
2025-12-05 13:16 ` Gabriele Monaco [this message]
2025-12-05 13:16 ` [PATCH v3 04/13] verification/rvgen: Add support for Hybrid Automata Gabriele Monaco
2025-12-25  1:05   ` Nam Cao
2025-12-05 13:16 ` [PATCH v3 05/13] Documentation/rv: Add documentation about hybrid automata Gabriele Monaco
2025-12-25  1:16   ` Nam Cao
2025-12-05 13:16 ` [PATCH v3 06/13] rv: Add sample hybrid monitors stall Gabriele Monaco
2025-12-18  6:32   ` Nam Cao
2025-12-05 13:16 ` [PATCH v3 07/13] rv: Convert the opid monitor to a hybrid automaton Gabriele Monaco
2025-12-18  6:50   ` Nam Cao
2025-12-05 13:16 ` [PATCH v3 08/13] sched: Export hidden tracepoints to modules Gabriele Monaco
2025-12-05 13:35   ` Phil Auld
2025-12-11 22:36     ` Phil Auld
2026-01-06 20:21       ` Phil Auld
2026-01-13 10:43   ` [tip: sched/core] " tip-bot2 for Gabriele Monaco
2025-12-05 13:16 ` [PATCH v3 09/13] sched: Add deadline tracepoints Gabriele Monaco
2025-12-05 13:41   ` Phil Auld
2025-12-05 13:16 ` [PATCH v3 10/13] rv: Add support for per-object monitors in DA/HA Gabriele Monaco
2025-12-18  7:26   ` Nam Cao
2025-12-05 13:16 ` [PATCH v3 11/13] verification/rvgen: Add support for per-obj monitors Gabriele Monaco
2025-12-05 13:16 ` [PATCH v3 12/13] rv: Add deadline monitors Gabriele Monaco
2025-12-25  1:35   ` Nam Cao
2025-12-25  1:58     ` Nam Cao
2025-12-29  7:00       ` Gabriele Monaco
2025-12-05 13:16 ` [PATCH v3 13/13] rv: Add dl_server specific monitors Gabriele Monaco
2025-12-25  1:51   ` 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=20251205131621.135513-4-gmonaco@redhat.com \
    --to=gmonaco@redhat.com \
    --cc=jkacur@redhat.com \
    --cc=jlelli@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=namcao@linutronix.de \
    --cc=rostedt@goodmis.org \
    --cc=tglozar@redhat.com \
    --cc=williams@redhat.com \
    /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

all inboxes | Powered by JetHome®