Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 01:02:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

verification/dot2: Improve dot parser robustness

Browse Source 
This patch makes the dot parser used by dot2c and dot2k slightly more
robust, namely:
* allows parsing files with the gv extension (GraphViz)
* correctly parses edges with any indentation
    * used to work only with a single character (e.g. '\t')
Additionally it fixes a couple of warnings reported by pylint such as
wrong indentation and comparison to False instead of `not ...`

Link: https://lore.kernel.org/20241017064238.41394-2-gmonaco@redhat.com
Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
This commit is contained in:
Gabriele Monaco 2024-10-17 08:42:39 +02:00 committed by Steven Rostedt (Google)
parent 4d8c1ba079
commit 571f8b3f86
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/verification/dot2/automata.py
View File

@ -29,11 +29,11 @@ class Automata:
def __get_model_name(self): def __get_model_name(self):
basename = ntpath.basename(self.__dot_path) basename = ntpath.basename(self.__dot_path)
if basename.endswith(".dot") == False: if not basename.endswith(".dot") and not basename.endswith(".gv"):
print("not a dot file") print("not a dot file")
raise Exception("not a dot file: %s" % self.__dot_path) raise Exception("not a dot file: %s" % self.__dot_path)
model_name = basename[0:-4] model_name = ntpath.splitext(basename)[0]
if model_name.__len__() == 0: if model_name.__len__() == 0:
raise Exception("not a dot file: %s" % self.__dot_path) raise Exception("not a dot file: %s" % self.__dot_path)
@ -68,9 +68,9 @@ class Automata:
def __get_cursor_begin_events(self): def __get_cursor_begin_events(self):
cursor = 0 cursor = 0
while self.__dot_lines[cursor].split()[0] != "{node": while self.__dot_lines[cursor].split()[0] != "{node":
cursor += 1 cursor += 1
while self.__dot_lines[cursor].split()[0] == "{node": while self.__dot_lines[cursor].split()[0] == "{node":
cursor += 1 cursor += 1
# skip initial state transition # skip initial state transition
cursor += 1 cursor += 1
return cursor return cursor
@ -94,11 +94,11 @@ class Automata:
initial_state = state[7:] initial_state = state[7:]
else: else:
states.append(state) states.append(state)
if self.__dot_lines[cursor].__contains__("doublecircle") == True: if "doublecircle" in self.__dot_lines[cursor]:
final_states.append(state) final_states.append(state)
has_final_states = True has_final_states = True
if self.__dot_lines[cursor].__contains__("ellipse") == True: if "ellipse" in self.__dot_lines[cursor]:
final_states.append(state) final_states.append(state)
has_final_states = True has_final_states = True
@ -110,7 +110,7 @@ class Automata:
# Insert the initial state at the bein og the states # Insert the initial state at the bein og the states
states.insert(0, initial_state) states.insert(0, initial_state)
if has_final_states == False: if not has_final_states:
final_states.append(initial_state) final_states.append(initial_state)
return states, initial_state, final_states return states, initial_state, final_states
@ -120,7 +120,7 @@ class Automata:
cursor = self.__get_cursor_begin_events() cursor = self.__get_cursor_begin_events()
events = [] events = []
while self.__dot_lines[cursor][1] == '"': while self.__dot_lines[cursor].lstrip()[0] == '"':
# transitions have the format: # transitions have the format:
# "all_fired" -> "both_fired" [ label = "disable_irq" ]; # "all_fired" -> "both_fired" [ label = "disable_irq" ];
# ------------ event is here ------------^^^^^ # ------------ event is here ------------^^^^^
@ -161,7 +161,7 @@ class Automata:
# and we are back! Let's fill the matrix # and we are back! Let's fill the matrix
cursor = self.__get_cursor_begin_events() cursor = self.__get_cursor_begin_events()
while self.__dot_lines[cursor][1] == '"': while self.__dot_lines[cursor].lstrip()[0] == '"':
if self.__dot_lines[cursor].split()[1] == "->": if self.__dot_lines[cursor].split()[1] == "->":
line = self.__dot_lines[cursor].split() line = self.__dot_lines[cursor].split()
origin_state = line[0].replace('"','').replace(',','_') origin_state = line[0].replace('"','').replace(',','_')