Imported Upstream version 2.5

[platform/upstream/powertop.git] / src / cpu / cpudevice.cpp

diff --git a/src/cpu/cpudevice.cpp b/src/cpu/cpudevice.cpp
index 48fbcf5..371d8a8 100644 (file)
--- a/src/cpu/cpudevice.cpp
+++ b/src/cpu/cpudevice.cpp
@@ -40,12 +40,20 @@ cpudevice::cpudevice(const char *classname, const char *dev_name, class abstract
        r_consumption_index = get_result_index("cpu-consumption");;
 }
 
+const char * cpudevice::device_name(void)
+{
+       if (child_devices.size())
+               return "CPU misc";
+       else
+               return "CPU use";
+}
 
 double cpudevice::power_usage(struct result_bundle *result, struct parameter_bundle *bundle)
 {
        double power;
        double factor;
        double _utilization;
+       double child_power;
 
        power = 0;
        factor = get_parameter_value(wake_index, bundle);
@@ -58,6 +66,12 @@ double cpudevice::power_usage(struct result_bundle *result, struct parameter_bun
 
        power += _utilization * factor;
 
+       for (unsigned int i = 0; i < child_devices.size(); ++i) {
+               child_power = child_devices[i]->power_usage(result, bundle);
+               if ((power - child_power) > 0.0)
+                       power -= child_power;
+       }
+
        return power;
 }