sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-30 22:54:18 +00:00
Code Issues Releases Wiki Activity

PowerStateProcessor: Exceptions no longer stop processing

Browse Source 
If an exception is raised inside a generator it cannot be continued.
To get around this exceptions are now caught and later output via the
logger.

Also added logger setup when running cpustates as a standalone script
This commit is contained in:
Sebastian Goscik
2016-06-06 15:48:47 +01:00
parent c423a8b4bc
commit 0ae03e2c54
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wlauto/utils/power.py
View File

@@ -157,6 +157,7 @@ class PowerStateProcessor(object):
self.requested_states = defaultdict(lambda: -1) # cpu_id -> requeseted state self.requested_states = defaultdict(lambda: -1) # cpu_id -> requeseted state
self.wait_for_start_marker = wait_for_start_marker self.wait_for_start_marker = wait_for_start_marker
self._saw_start_marker = False self._saw_start_marker = False
self.exceptions = []
idle_state_domains = build_idle_domains(core_clusters, idle_state_domains = build_idle_domains(core_clusters,
num_states=num_idle_states, num_states=num_idle_states,
@@ -173,9 +174,12 @@ class PowerStateProcessor(object):
def process(self, event_stream): def process(self, event_stream):
for event in event_stream: for event in event_stream:
next_state = self.update_power_state(event) try:
if self._saw_start_marker or not self.wait_for_start_marker: next_state = self.update_power_state(event)
yield next_state if self._saw_start_marker or not self.wait_for_start_marker:
yield next_state
except Exception as e: # pylint: disable=broad-except
self.exceptions.append(e)
def update_power_state(self, event): def update_power_state(self, event):
""" """
@@ -641,6 +645,11 @@ def report_power_stats(trace_file, idle_state_names, core_names, core_clusters,
for reporter in reporters: for reporter in reporters:
reporter.update(timestamp, states) reporter.update(timestamp, states)
if ps_processor.exceptions:
logger.warning('There were errors while processing trace:')
for e in ps_processor.exceptions:
logger.warning(str(e))
reports = [] reports = []
for reporter in reporters: for reporter in reporters:
report = reporter.report() report = reporter.report()
@@ -650,6 +659,7 @@ def report_power_stats(trace_file, idle_state_names, core_names, core_clusters,
def main(): def main():
# pylint: disable=unbalanced-tuple-unpacking # pylint: disable=unbalanced-tuple-unpacking
logging.basicConfig(level=logging.INFO)
args = parse_arguments() args = parse_arguments()
parallel_report, powerstate_report = report_power_stats( parallel_report, powerstate_report = report_power_stats(
trace_file=args.infile, trace_file=args.infile,