Skip to content

fix(gcpt-collection): fix the bug that only process the first regex #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Frankslu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(gcpt-collection): fix the bug that only process the first regex #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions perf/perfcounter_list/calculation_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,36 @@ def get_perf_counter_to_parse(self, eg_file = None):
return self.parse_map
else:
res = []
re_tmp = []
with open(eg_file, "r") as file:
res_from_set = set()
res_to_set = set()
for pm in self.parse_map:
if isinstance(pm[1], str):
# normal patten
res.append(pm)
elif callable(pm[1]):
pm_tmp = pm.copy()
pm_tmp[0] = re.compile(pm_tmp[0])
re_tmp.append(pm_tmp)
else:
patten_re = re.compile(pm[0])
name_func = pm[1]
for line in file:
res_re = patten_re.match(line)
if res_re != None:
from_str = res_re.group("fullMatch")
to_str = name_func(res_re)
to_show = False if len(pm) < 3 else pm[2]
if not (from_str in res_from_set) and not (to_str in res_to_set):
res_from_set.add(from_str)
res_to_set.add(to_str)
res.append([from_str, to_str, to_show])
# print("re counter:" + res_re.group("fullMatch") + " name: " + name_func(res_re) + " to_show: " + str(to_show))
print(f"{__file__} {__name__} parse_map error. Second variable should be string or function")
sys.exit(1)

if len(re_tmp) == 0:
return res

for line in file:
for pm in re_tmp:
res_re = pm[0].match(line)
if res_re != None:
from_str = res_re.group("fullMatch")
to_str = pm[1](res_re)
to_show = False if len(pm) < 3 else pm[2]
if not (from_str in res_from_set) and not (to_str in res_to_set):
res_from_set.add(from_str)
res_to_set.add(to_str)
res.append([from_str, to_str, to_show])
return res

def get_perf_counter_to_show(self, eg_file = None):
Expand Down