Changeset 883 for DCWoRMS/branches/coolemall/src/example/energy/CPUEnergyEstimationPlugin.java

Timestamp:

02/26/13 08:41:50 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall

Files:

• . (copied) (copied from DCWoRMS/trunk)
• src/example/energy/CPUEnergyEstimationPlugin.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/example/energy/CPUEnergyEstimationPlugin.java

@@ -17 +17 @@
                         powerConsumption = 0;
                 else {
-                        try {
-                                if(resource.getStatus() == ResourceStatus.BUSY)
+                        if(resource.getStatus() == ResourceStatus.BUSY){
+                                try {
+
                                         powerConsumption = cpu.getPowerInterface().getPowerConsumption(cpu.getPowerInterface().getPState());
-                                else {
-                                        powerConsumption = cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
+                                } catch (NoSuchFieldException e) {
+                                        try {
+                                                powerConsumption = cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
+                                        } catch (NoSuchFieldException e1) {
+                                                powerConsumption = 10;
+                                        }
                                 }
-                        } catch (NoSuchFieldException e) {
+                        } else{
                                 try {
-                                        powerConsumption = cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
-                                } catch (NoSuchFieldException e1) {
-                                        powerConsumption = 10;
+                                        powerConsumption = cpu.getPowerInterface().getPowerConsumption(cpu.getPowerInterface().getPState());
+                                } catch (NoSuchFieldException e) {
+                                        try {
+                                                powerConsumption = cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
+                                        } catch (NoSuchFieldException e1) {
+                                                powerConsumption = 0;
+                                        }
                                 }
                         }
+                        
                 }
                 return powerConsumption;