sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-11-04 07:51:21 +00:00
Code Issues Releases Wiki Activity

trace-cmd: Respect strict when setting saved_cmdlines_size

Browse Source 
Not all devices have the `saved_cmdlines_size` node exposed and therefore
attempting to set this can fail. Raise an error for this only when
`strict` is set to `True` otherwise raise a warning instead.
This commit is contained in:
Marc Bonnici
2019-11-04 17:24:56 +00:00
parent 43673e3fc5
commit 3801fe1d67
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
devlib/trace/ftrace.py
View File

@@ -80,6 +80,7 @@ class FtraceCollector(TraceCollector):
self.automark = automark self.automark = automark
self.autoreport = autoreport self.autoreport = autoreport
self.autoview = autoview self.autoview = autoview
self.strict = strict
self.report_on_target = report_on_target self.report_on_target = report_on_target
self.target_output_file = target.path.join(self.target.working_directory, OUTPUT_TRACE_FILE) self.target_output_file = target.path.join(self.target.working_directory, OUTPUT_TRACE_FILE)
text_file_name = target.path.splitext(OUTPUT_TRACE_FILE)[0] + '.txt' text_file_name = target.path.splitext(OUTPUT_TRACE_FILE)[0] + '.txt'
@@ -146,7 +147,7 @@ class FtraceCollector(TraceCollector):
message = 'Events not available for tracing: {}'.format( message = 'Events not available for tracing: {}'.format(
', '.join(unavailable_events) ', '.join(unavailable_events)
) )
if strict: if self.strict:
raise TargetStableError(message) raise TargetStableError(message)
else: else:
self.target.logger.warning(message) self.target.logger.warning(message)
@@ -170,7 +171,7 @@ class FtraceCollector(TraceCollector):
for function in self.functions: for function in self.functions:
if function not in available_functions: if function not in available_functions:
message = 'Function [{}] not available for profiling'.format(function) message = 'Function [{}] not available for profiling'.format(function)
if strict: if self.strict:
raise TargetStableError(message) raise TargetStableError(message)
self.target.logger.warning(message) self.target.logger.warning(message)
else: else:
@@ -226,7 +227,17 @@ class FtraceCollector(TraceCollector):
tracer_string = '-p {}'.format(self.tracer) if self.tracer else '' tracer_string = '-p {}'.format(self.tracer) if self.tracer else ''
self.target.write_value(self.trace_clock_file, self.trace_clock, verify=False) self.target.write_value(self.trace_clock_file, self.trace_clock, verify=False)
self.target.write_value(self.save_cmdlines_size_file, self.saved_cmdlines_nr) try:
self.target.write_value(self.save_cmdlines_size_file, self.saved_cmdlines_nr)
except TargetStableError as e:
message = 'Could not set "save_cmdlines_size"'
if self.strict:
self.logger.error(message)
raise e
else:
self.logger.warning(message)
self.logger.debug(e)
self.target.execute( self.target.execute(
'{} start {events} {tracer} {functions}'.format( '{} start {events} {tracer} {functions}'.format(
self.target_binary, self.target_binary,