diff options
author | Javi Merino <javi.merino@arm.com> | 2015-12-21 15:41:01 +0000 |
---|---|---|
committer | Javi Merino <javi.merino@arm.com> | 2015-12-22 15:50:37 +0000 |
commit | 4c0e5505be736c393a47880583ea053addf035d8 (patch) | |
tree | 547d155978ca1161eab610e05dca6f00fb62cd06 | |
parent | 886c03e14e88478cb199cef643bd56059ffdc1ca (diff) | |
download | trappy-4c0e5505be736c393a47880583ea053addf035d8.tar.gz |
ftrace: Learn again to normalize the time against an arbitrary basetime
In the past ftrace.normalize_time() accepted an arbitrary basetime
parameter. This was lost in c79eccd5370e ("run: drop get_basetime()
method") but the documentation of normalize_time() still talks about the
basetime parameter. Recover it.
-rw-r--r-- | tests/test_ftrace.py | 15 | ||||
-rw-r--r-- | trappy/ftrace.py | 6 |
2 files changed, 20 insertions, 1 deletions
diff --git a/tests/test_ftrace.py b/tests/test_ftrace.py index e5e94c7..9f9dd2d 100644 --- a/tests/test_ftrace.py +++ b/tests/test_ftrace.py @@ -216,6 +216,21 @@ class TestFTrace(BaseTestThermal): exp_inpower_last = prev_inpower_last - trace.basetime self.assertEquals(round(trace.cpu_in_power.data_frame.index[-1] - exp_inpower_last, 7), 0) + def test_ftrace_normalize_time_accepts_basetime(self): + """FTrace().normalize_time() accepts an arbitrary basetime""" + + trace = trappy.FTrace(normalize_time=False) + + prev_inpower_first = trace.cpu_in_power.data_frame.index[0] + basetime = 3 + + trace.normalize_time(basetime) + + self.assertEquals(trace.basetime, 3) + + exp_inpower_first = prev_inpower_first - 3 + self.assertEquals(round(trace.cpu_in_power.data_frame.index[0] - exp_inpower_first, 7), 0) + def test_ftrace_accepts_events(self): """The FTrace class accepts an events parameter with only the parameters interesting for a trace""" diff --git a/trappy/ftrace.py b/trappy/ftrace.py index e251346..40867e2 100644 --- a/trappy/ftrace.py +++ b/trappy/ftrace.py @@ -259,13 +259,17 @@ class FTrace(object): return filters - def normalize_time(self): + def normalize_time(self, basetime=None): """Normalize the time of all the trace classes :param basetime: The offset which needs to be subtracted from the time index :type basetime: float """ + + if basetime is not None: + self.basetime = basetime + for trace_class in self.trace_classes: trace_class.normalize_time(self.basetime) |