Changeset 913

Timestamp:

03/04/13 11:46:43 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/example/energy/coolemall

Files:

• CB1EnergyEstimationPlugin.java (modified) (2 diffs)
• NodeEnergyEstimationPlugin.java (modified) (2 diffs)
• NodeGroupEnergyEstimationPlugin.java (modified) (2 diffs)
• ProcessorEnergyEstimationPlugin.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package example.energy.coolemall;
 
+import schedframe.Parameter;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.power.PowerUsage;
 import schedframe.resources.computing.recs.ComputeBox1;
 import schedframe.resources.computing.recs.NodeGroup;
@@ -13 +13 @@
         public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry,
                         ComputingResource resource) {
-                double power = 0;
+                double powerConsumption = 0;
                 ComputeBox1 computeBox1 = (ComputeBox1)resource;
                 for(NodeGroup ng:computeBox1.getNodesGroups()){
-                        PowerUsage powerUsage = ng.getPowerInterface().getRecentPowerUsage();
-                        power += (powerUsage == null ? 0 : powerUsage.getValue());
+                        try{
+                                powerConsumption = powerConsumption + ng.getPowerInterface().getRecentPowerUsage().getValue();
+                        } catch (Exception e){
+                                
+                        }
                 }
 
-                return power;
+                try {
+                        powerConsumption = powerConsumption + computeBox1.getPowerInterface().getPowerConsumption(computeBox1.getPowerInterface().getPowerState());
+                } catch (NoSuchFieldException e) {
+                        Parameter param = computeBox1.getResourceCharacteristic().getParameters().get("maxPower");
+                        if(param != null)
+                                powerConsumption = powerConsumption + Double.valueOf(param.get(0).getContent());
+                }
+
+                
+                return powerConsumption;
         }
 

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

@@ -1 +1 @@
 package example.energy.coolemall;
 
+import schedframe.Parameter;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
@@ -24 +25 @@
                         powerConsumption = powerConsumption + node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
                 } catch (NoSuchFieldException e) {
+                        Parameter param = node.getResourceCharacteristic().getParameters().get("maxPower");
+                        if(param != null)
+                                powerConsumption = powerConsumption + Double.valueOf(param.get(0).getContent());
                 }
 

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

@@ -1 +1 @@
 package example.energy.coolemall;
 
+import schedframe.Parameter;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.power.PowerUsage;
 import schedframe.resources.computing.recs.Node;
 import schedframe.resources.computing.recs.NodeGroup;
@@ -13 +13 @@
         public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry,
                         ComputingResource resource) {
-                double power = 0;
+                double powerConsumption = 0;
                 NodeGroup nodeGroup = (NodeGroup)resource;
                 for(Node cn: nodeGroup.getNodes()){
-                        PowerUsage powerUsage = cn.getPowerInterface().getRecentPowerUsage();
-                        power += (powerUsage == null ? 0 : powerUsage.getValue());
+                        try{
+                                powerConsumption = powerConsumption + cn.getPowerInterface().getRecentPowerUsage().getValue();
+                        } catch (Exception e){
+                                
+                        }
+                }
+                try {
+                        powerConsumption = powerConsumption + nodeGroup.getPowerInterface().getPowerConsumption(nodeGroup.getPowerInterface().getPowerState());
+                } catch (NoSuchFieldException e) {
+                        Parameter param = nodeGroup.getResourceCharacteristic().getParameters().get("maxPower");
+                        if(param != null)
+                                powerConsumption = powerConsumption + Double.valueOf(param.get(0).getContent());
                 }
 
-                return power;
+                return powerConsumption;
         }
 

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

@@ -1 +1 @@
 package example.energy.coolemall;
 
+import schedframe.Parameter;
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
@@ -13 +14 @@
         public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry,
                         ComputingResource resource) {
-                double powerConsumption;
+                double powerConsumption = 0;
                 Processor cpu = (Processor)resource;
                 if(resource.getPowerInterface().getPowerState().equals(StandardPowerStateName.OFF))
                         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) {
+                                        Parameter param = cpu.getResourceCharacteristic().getParameters().get("maxPower");
+                                        if(param != null)
+                                                powerConsumption = Double.valueOf(param.get(0).getContent());
                                 }
-                        } catch (NoSuchFieldException e) {
+                        }
+                        else {
                                 try {
                                         powerConsumption = cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
-                                } catch (NoSuchFieldException e1) {
-                                        powerConsumption = 10;
+                                } catch (NoSuchFieldException e) {
+                                        Parameter param = cpu.getResourceCharacteristic().getParameters().get("maxPower");
+                                        if(param != null)
+                                                powerConsumption = 0.7 * Double.valueOf(param.get(0).getContent());
                                 }
                         }