Changeset 532

Timestamp:

10/30/12 11:12:54 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/example/energy

Files:

• CPUEnergyEstimationPlugin.java (modified) (2 diffs)
• ComputingNodeEnergyEstimationPlugin.java (modified) (2 diffs)

DCWoRMS/trunk/src/example/energy/CPUEnergyEstimationPlugin.java

@@ -9 +9 @@
 public class CPUEnergyEstimationPlugin extends BaseEnergyEstimationPlugin  {
 
-        @Override
         public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry,
                         ComputingResource resource) {
+                double powerConsumption;
                 Processor cpu = (Processor)resource;
                 if(resource.getPowerInterface().getPowerState().equals(StandardPowerStateName.OFF))
-                        return 0;
+                        powerConsumption = 0;
                 else {
                         try {
@@ -22 +22 @@
                                         return cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
                                 } catch (NoSuchFieldException e1) {
+                                        powerConsumption = 1;
                                 }
                         }
-                        return 1;
                 }
-
+                return powerConsumption;
         }
 

DCWoRMS/trunk/src/example/energy/ComputingNodeEnergyEstimationPlugin.java

@@ -9 +9 @@
 public class ComputingNodeEnergyEstimationPlugin extends BaseEnergyEstimationPlugin {
 
-        @Override
         public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry,
                         ComputingResource resource) {
-                double power = 0;
+                double powerConsumption = 0;
                 ComputingNode node = (ComputingNode) resource;
                 for(Processor cpu: node.getProcessors()){
                         try{
-                                power = power + cpu.getPowerInterface().getRecentPowerUsage().getValue();
+                                powerConsumption = powerConsumption + cpu.getPowerInterface().getRecentPowerUsage().getValue();
                         } catch (Exception e){
                                 
@@ -22 +21 @@
                 }
                 try {
-                        power = power + node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
+                        powerConsumption = powerConsumption + node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
                 } catch (NoSuchFieldException e) {
                 }
 
-                return power;
+                return powerConsumption;
         }
 
-
 }