Changeset 546

Timestamp:

11/05/12 16:05:28 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src

Files:

• example/energy/DefaultEnergyEstimationPlugin.java (modified) (1 diff)
• schedframe/resources/computing/profiles/energy/power/PowerProfile.java (modified) (2 diffs)

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

@@ -16 +16 @@
                         powerConsumption = 0;
                 }
+                
+                powerConsumption = powerConsumption + getChildrenPowerConsumption(resource);
+                
                 for(ComputingResource child:resource.getChildren()){
-                        powerConsumption = powerConsumption + child.getPowerInterface().getRecentPowerUsage().getValue(); 
+                        try {
+                                //powerConsumption = powerConsumption + child.getPowerInterface().getRecentPowerUsage().getValue(); 
+                        } catch (Exception e) {
+
+                        }
+                }
+                return powerConsumption;
+        }
+        
+        private double getChildrenPowerConsumption(ComputingResource resource){
+                double powerConsumption = 0;
+                for(ComputingResource child:resource.getChildren()){
+                        try {
+                                powerConsumption = powerConsumption + child.getPowerInterface().getRecentPowerUsage().getValue(); 
+                        } catch (Exception e) {
+                                powerConsumption = powerConsumption + getChildrenPowerConsumption(child);
+                        }
                 }
                 return powerConsumption;

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/PowerProfile.java

@@ -16 +16 @@
         protected EnergyEstimationPlugin energyEstimationPlugin;
 
-        protected List<schedframe.resources.computing.profiles.energy.power.PowerState> supportedPowerStates;
+        protected List<PowerState> supportedPowerStates;
         protected Map<String, PState> supportedPStates;
         
@@ -60 +60 @@
         }
         
-        public List<schedframe.resources.computing.profiles.energy.power.PowerState> getSupportedPowerStates() throws NoSuchFieldException{
+        public List<PowerState> getSupportedPowerStates() throws NoSuchFieldException{
                 if(supportedPowerStates == null)
                         throw new NoSuchFieldException("Supported power states are not defined.");