Skip to content
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

Fix cpufreq event #712

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix cpufreq event #712

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
054f24a
collector/ftrace: Remove cpu_frequency_devlib event in FtraceCollecto…
douglas-raillard-arm Feb 3, 2025
1a368c8
collector/ftrace: Make emitting cpu_frequency_devlib and extra idle e…
douglas-raillard-arm Feb 3, 2025
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
40 changes: 29 additions & 11 deletions devlib/collector/ftrace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ def __init__(self, target,
self.host_binary = None
self.start_time = None
self.stop_time = None
self.event_string = None
self.function_string = None
self.trace_clock = trace_clock
self.saved_cmdlines_nr = saved_cmdlines_nr
Expand Down Expand Up @@ -195,7 +194,11 @@ def event_is_in_list(event, events):
elif self.tracer == 'function_graph':
self.function_string = _build_graph_functions(selected_functions, trace_children_functions)

self.event_string = _build_trace_events(selected_events)
self._selected_events = selected_events

@property
def event_string(self):
return _build_trace_events(self._selected_events)

@classmethod
def _resolve_tracing_path(cls, target, path):
Expand Down Expand Up @@ -266,6 +269,26 @@ def reset(self):

self._reset_needed = False

def _trace_frequencies(self):
if 'cpu_frequency' in self._selected_events:
self.logger.debug('Trace CPUFreq frequencies')
try:
mod = self.target.cpufreq
except TargetStableError as e:
self.logger.error(f'Could not trace CPUFreq frequencies as the cpufreq module cannot be loaded: {e}')
else:
mod.trace_frequencies()

def _trace_idle(self):
if 'cpu_idle' in self._selected_events:
self.logger.debug('Trace CPUIdle states')
try:
mod = self.target.cpuidle
except TargetStableError as e:
self.logger.error(f'Could not trace CPUIdle states as the cpuidle module cannot be loaded: {e}')
else:
mod.perturb_cpus()

@asyncf
async def start(self):
self.start_time = time.time()
Expand Down Expand Up @@ -298,12 +321,10 @@ async def start(self):
)
if self.automark:
self.mark_start()
if 'cpufreq' in self.target.modules:
self.logger.debug('Trace CPUFreq frequencies')
self.target.cpufreq.trace_frequencies()
if 'cpuidle' in self.target.modules:
self.logger.debug('Trace CPUIdle states')
self.target.cpuidle.perturb_cpus()

self._trace_frequencies()
self._trace_idle()

# Enable kernel function profiling
if self.functions and self.tracer is None:
target = self.target
Expand All @@ -324,9 +345,6 @@ def stop(self):
if self.functions and self.tracer is None:
self.target.execute('echo 0 > {}'.format(self.function_profile_file),
as_root=True)
if 'cpufreq' in self.target.modules:
self.logger.debug('Trace CPUFreq frequencies')
self.target.cpufreq.trace_frequencies()
self.stop_time = time.time()
if self.automark:
self.mark_stop()
Expand Down