Using decorator for power monitoring.

tools/perf/metrics/power.py

Index: tools/perf/metrics/power.py
diff --git a/tools/perf/metrics/power.py b/tools/perf/metrics/power.py
index f98352ecc45aa85aaba88972106ad97093bb92a8..cd3ec5052dd0ed030506fe3ce98484237961b95a 100644
--- a/tools/perf/metrics/power.py
+++ b/tools/perf/metrics/power.py
@@ -79,14 +79,15 @@ class PowerMetric(Metric):
 
     self._StopInternal()
 
-  def AddResults(self, _, results):
+  def AddResults(self, _, results, prefix=''):
     if not self._results:
       return
 
     energy_consumption_mwh = self._results.get('energy_consumption_mwh')
     # Testing for None, as 0 is a valid value.
     if energy_consumption_mwh is not None:
-      results.Add('energy_consumption_mwh', 'mWh', energy_consumption_mwh)
+      results.Add('%senergy_consumption_mwh' % prefix, 'mWh',
+                  energy_consumption_mwh)
 
     component_utilization = self._results.get('component_utilization', {})
     # GPU Frequency.
@@ -94,11 +95,12 @@ class PowerMetric(Metric):
     gpu_freq_hz = gpu_power.get('average_frequency_hz')
     # Testing for None, as 0 is a valid value.
     if gpu_freq_hz is not None:
-      results.Add('gpu_average_frequency_hz', 'hz', gpu_freq_hz)
+      results.Add('%sgpu_average_frequency_hz' % prefix, 'hz', gpu_freq_hz)
 
     # Add idle wakeup numbers for all processes.
     for (process_type, stats) in self._results.get('cpu_stats', {}).items():
-      trace_name_for_process = 'idle_wakeups_%s' % (process_type.lower())
+      trace_name_for_process = '%sidle_wakeups_%s' % (prefix,
+                                                      process_type.lower())
       results.Add(trace_name_for_process, 'count', stats)
 
     self._results = None