From bda7a16656809e95cdba13560018ea2cb95d10f9 Mon Sep 17 00:00:00 2001 From: Patrick Bellasi Date: Tue, 26 Jan 2016 14:59:53 +0000 Subject: [PATCH] ftrace: move file path definitions All ftrace generated files are present under a common base folder. This patch updates the FtraceCollector API to exposes just the common base folder from where all the other paths can be generated. This is a refactoring patch which makes it easier to add further attributes. Signed-off-by: Patrick Bellasi --- devlib/trace/ftrace.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/devlib/trace/ftrace.py b/devlib/trace/ftrace.py index 2973e0b..4851382 100644 --- a/devlib/trace/ftrace.py +++ b/devlib/trace/ftrace.py @@ -47,8 +47,7 @@ class FtraceCollector(TraceCollector): events=None, buffer_size=None, buffer_size_step=1000, - buffer_size_file='/sys/kernel/debug/tracing/buffer_size_kb', - marker_file='/sys/kernel/debug/tracing/trace_marker', + tracing_path='/sys/kernel/debug/tracing', automark=True, autoreport=True, autoview=False, @@ -58,8 +57,7 @@ class FtraceCollector(TraceCollector): self.events = events if events is not None else DEFAULT_EVENTS self.buffer_size = buffer_size self.buffer_size_step = buffer_size_step - self.buffer_size_file = buffer_size_file - self.marker_file = marker_file + self.tracing_path = tracing_path self.automark = automark self.autoreport = autoreport self.autoview = autoview @@ -71,6 +69,10 @@ class FtraceCollector(TraceCollector): self.event_string = _build_trace_events(self.events) self._reset_needed = True + # Setup tracing paths + self.buffer_size_file = self.target.path.join(self.tracing_path, 'buffer_size_kb') + self.marker_file = self.target.path.join(self.tracing_path, 'trace_marker') + self.host_binary = which('trace-cmd') self.kernelshark = which('kernelshark')