viz: now using all values found by --parse-regex

bh107 · May 24, 2017 · e684a4d · e684a4d
1 parent 3f7a18e
commit e684a4d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/benchpress/__init__.py b/benchpress/__init__.py
@@ -28,6 +28,7 @@
     # package is not installed
     pass
 
+
 # We expose the suite schema as the dict `suite_schema`
 def _suite_schema():
     from os.path import join, realpath, dirname

diff --git a/benchpress/visualizer/cli.py b/benchpress/visualizer/cli.py
@@ -16,9 +16,10 @@ def visualize(args):
         values = []
         for job in cmd['jobs']:
             for res in job['results']:
-                match = re.search(args.parse_regex, res['stdout'])
-                if res['success'] and match:
-                    values.append(args.py_type(match.group(1)))
+                match_list = re.findall(args.parse_regex, res['stdout'])
+                if res['success'] and len(match_list) > 0:
+                    for match in match_list:
+                        values.append(args.py_type(match))
                 else:
                     values.append("N/A")
         succeed_values = util.extract_succeed_results(cmd, args.parse_regex, args.py_type)

diff --git a/benchpress/visualizer/util.py b/benchpress/visualizer/util.py
@@ -157,9 +157,10 @@ def extract_succeed_results(cmd, regex, py_type=int, dict_key='stdout'):
     ret = []
     for job in cmd.get('jobs', []):
         for res in job.get('results', []):
-            match = re.search(regex, res[dict_key])
-            if res['success'] and match:
-                ret.append(py_type(match.group(1)))
+            match_list = re.findall(regex, res[dict_key])
+            if res['success'] and len(match_list) > 0:
+                for match in match_list:
+                    ret.append(py_type(match))
     return ret