ftrace: rename Run to FTrace
Run is a very generic and inappropriate name for an object that parses
the result of ftrace into a form consumable by python. Rename it to
FTrace in preparation for its generalization.
diff --git a/tests/test_cpu_power.py b/tests/test_cpu_power.py
index af60939..f3bb8dc 100644
--- a/tests/test_cpu_power.py
+++ b/tests/test_cpu_power.py
@@ -52,21 +52,21 @@
def test_cpuoutpower_dataframe(self):
"""Test that CpuOutPower() creates a proper data_frame"""
- outp = trappy.Run().cpu_out_power
+ outp = trappy.FTrace().cpu_out_power
self.assertEquals(outp.data_frame["power"].iloc[0], 1344)
self.assertTrue("cdev_state" in outp.data_frame.columns)
def test_cpuoutpower_get_all_freqs(self):
"""Test CpuOutPower.get_all_freqs()"""
- dfr = trappy.Run().cpu_out_power.get_all_freqs(self.map_label)
+ dfr = trappy.FTrace().cpu_out_power.get_all_freqs(self.map_label)
self.assertEquals(dfr["A57"].iloc[0], 1100)
self.assertEquals(dfr["A53"].iloc[1], 850)
def test_cpuinpower_get_dataframe(self):
"""Test that CpuInPower() creates a proper data_frame()"""
- inp = trappy.Run().cpu_in_power
+ inp = trappy.FTrace().cpu_in_power
self.assertTrue("load0" in inp.data_frame.columns)
self.assertEquals(inp.data_frame["load0"].iloc[0], 24)
@@ -80,7 +80,7 @@
with open("trace.txt", "w") as fout:
fout.write(in_data)
- inp = trappy.Run(normalize_time=False).cpu_in_power
+ inp = trappy.FTrace(normalize_time=False).cpu_in_power
self.assertEquals(round(inp.data_frame.index[0], 6), 676.256284)
self.assertEquals(inp.data_frame["cpus"].iloc[1], "00000000,00000030")
@@ -97,7 +97,7 @@
with open("trace.txt", "w") as fout:
fout.write(in_data)
- inp = trappy.Run(normalize_time=False).cpu_in_power
+ inp = trappy.FTrace(normalize_time=False).cpu_in_power
self.assertEquals(inp.data_frame["load0"].iloc[0], 74)
self.assertEquals(inp.data_frame["load1"].iloc[0], 49)
@@ -110,7 +110,7 @@
def test_cpuinpower_get_all_freqs(self):
"""Test CpuInPower.get_all_freqs()"""
- dfr = trappy.Run().cpu_in_power.get_all_freqs(self.map_label)
+ dfr = trappy.FTrace().cpu_in_power.get_all_freqs(self.map_label)
self.assertEquals(dfr["A57"].iloc[0], 1100)
self.assertEquals(dfr["A53"].iloc[1], 850)
@@ -118,22 +118,22 @@
def test_cpuinpower_get_load_data(self):
"""Test CpuInPower.get_load_data()"""
- run = trappy.Run()
- first_load = run.cpu_in_power.data_frame["load0"].iloc[0]
- load_data = run.cpu_in_power.get_load_data(self.map_label)
+ trace = trappy.FTrace()
+ first_load = trace.cpu_in_power.data_frame["load0"].iloc[0]
+ load_data = trace.cpu_in_power.get_load_data(self.map_label)
self.assertEquals(load_data["A57"].iloc[0], 24 + 19)
self.assertEquals(load_data["A53"].iloc[3], 32 + 28 + 46 + 44)
self.assertEquals(load_data["A57"].iloc[0], load_data["A57"].iloc[1])
- self.assertEquals(run.cpu_in_power.data_frame["load0"].iloc[0],
+ self.assertEquals(trace.cpu_in_power.data_frame["load0"].iloc[0],
first_load)
def test_cpuinpower_get_normalized_load_data(self):
"""Test CpuInPower.get_normalized_load_data()"""
- run = trappy.Run()
- first_load = run.cpu_in_power.data_frame["load0"].iloc[0]
- load_data = run.cpu_in_power.get_normalized_load_data(self.map_label)
+ trace = trappy.FTrace()
+ first_load = trace.cpu_in_power.data_frame["load0"].iloc[0]
+ load_data = trace.cpu_in_power.get_normalized_load_data(self.map_label)
# Ideally the trace should have an event in which the cpus are
# not running at maximum frequency
@@ -141,5 +141,5 @@
(24. + 19) * 1100000 / (1100000 * 2))
self.assertEquals(load_data["A53"].iloc[1],
(36. + 49 + 48 + 7) * 850000 / (850000 * 4))
- self.assertEquals(run.cpu_in_power.data_frame["load0"].iloc[0],
+ self.assertEquals(trace.cpu_in_power.data_frame["load0"].iloc[0],
first_load)