diff options
Diffstat (limited to 'parse')
-rw-r--r-- | parse/ft.py | 2 | ||||
-rw-r--r-- | parse/sched.py | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/parse/ft.py b/parse/ft.py index fea246a..a6596b7 100644 --- a/parse/ft.py +++ b/parse/ft.py | |||
@@ -71,7 +71,7 @@ def extract_ft_data(result, data_dir, work_dir, cycles): | |||
71 | with open("%s/%s" % (work_dir, FT_ERR_NAME), 'w') as err_file: | 71 | with open("%s/%s" % (work_dir, FT_ERR_NAME), 'w') as err_file: |
72 | sorted_bin = sort_ft(bin_file, err_file, work_dir) | 72 | sorted_bin = sort_ft(bin_file, err_file, work_dir) |
73 | 73 | ||
74 | for event in conf.BASE_EVENTS: | 74 | for event in conf.OVH_BASE_EVENTS: |
75 | parse_overhead(result, sorted_bin, event, cycles, | 75 | parse_overhead(result, sorted_bin, event, cycles, |
76 | work_dir, err_file) | 76 | work_dir, err_file) |
77 | 77 | ||
diff --git a/parse/sched.py b/parse/sched.py index ffc6224..512ac73 100644 --- a/parse/sched.py +++ b/parse/sched.py | |||
@@ -32,8 +32,8 @@ class TimeTracker: | |||
32 | self.job = record.job | 32 | self.job = record.job |
33 | 33 | ||
34 | # Data stored for each task | 34 | # Data stored for each task |
35 | TaskParams = namedtuple('TaskParams', ['wcet', 'period', 'cpu']) | 35 | TaskParams = namedtuple('TaskParams', ['wcet', 'period', 'cpu']) |
36 | TaskData = recordtype('TaskData', ['params', 'jobs', 'blocks', 'misses']) | 36 | TaskData = recordtype('TaskData', ['params', 'jobs', 'blocks', 'misses']) |
37 | 37 | ||
38 | # Map of event ids to corresponding class, binary format, and processing methods | 38 | # Map of event ids to corresponding class, binary format, and processing methods |
39 | RecordInfo = namedtuple('RecordInfo', ['clazz', 'fmt', 'method']) | 39 | RecordInfo = namedtuple('RecordInfo', ['clazz', 'fmt', 'method']) |
@@ -151,10 +151,12 @@ def extract_sched_data(result, data_dir, work_dir): | |||
151 | return | 151 | return |
152 | 152 | ||
153 | # Save an in-english version of the data for debugging | 153 | # Save an in-english version of the data for debugging |
154 | cmd_arr = [conf.BINS['st_show']] | 154 | # This is optional and will only be done if 'st_show' is in PATH |
155 | cmd_arr.extend(bins) | 155 | if conf.BINS['st_show']: |
156 | with open(output_file, "w") as f: | 156 | cmd_arr = [conf.BINS['st_show']] |
157 | subprocess.call(cmd_arr, cwd=data_dir, stdout=f) | 157 | cmd_arr.extend(bins) |
158 | with open(output_file, "w") as f: | ||
159 | subprocess.call(cmd_arr, cwd=data_dir, stdout=f) | ||
158 | 160 | ||
159 | task_dict = defaultdict(lambda : | 161 | task_dict = defaultdict(lambda : |
160 | TaskData(0, 0, TimeTracker(), TimeTracker())) | 162 | TaskData(0, 0, TimeTracker(), TimeTracker())) |