Changeset 1577 for DCWoRMS/branches

Timestamp:

02/04/16 11:25:04 (9 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/experiments/e2dc2014/NodeEnergyEstimationPlugin.java (modified) (3 diffs)

DCWoRMS/branches/coolemall/src/experiments/e2dc2014/NodeEnergyEstimationPlugin.java

@@ -39 +39 @@
                                                 if(fan.getPowerInterface().getRecentPowerUsage().getValue() == -1){
                                                         try {
-                                                                powerConsumption = powerConsumption + fan.getAirflowInterface().getPowerConsumption(fan.getAirflowInterface().getAirflowState())/getNumberOfWorkingNodes(fan);
+                                                                powerConsumption = powerConsumption + fan.getAirflowInterface().getPowerConsumption(fan.getAirflowInterface().getAirflowState()) * (getFactor(fan)/(double)fan.getChilledResources().size())/getNumberOfWorkingNodes(fan);
                                                         } catch (NoSuchFieldException e) {
                                                                 // TODO Auto-generated catch block
@@ -68 +68 @@
         
         private double getFactor(Device device){
-                int quantity = 0;
 
                 double factor = 0;;
@@ -78 +77 @@
                         double meanMaxFrequency = 0;
                         if(fan.getChilledResources().contains(node.getFullName()) && node.getPowerInterface().getPowerState().equals(StandardPowerStateName.ON) ){
-                                quantity++;
                                 for(Processor proc: node.getProcessors()){
                                         if(proc.getCores().size() != proc.getFreeCores().size()){
                                                 nrOfComputingProcessor++;
+                                                meanCurrFrequency = meanCurrFrequency + proc.getPowerInterface().getFrequency();
+                                                meanMaxFrequency = meanMaxFrequency + proc.getPowerInterface().getLowestPState().getFrequency();        
+                                        } else {
+                                                meanCurrFrequency = meanCurrFrequency + proc.getPowerInterface().getHighestPState().getFrequency();
+                                                meanMaxFrequency = meanMaxFrequency + proc.getPowerInterface().getLowestPState().getFrequency();                                                
                                         }
-                                        meanCurrFrequency = meanCurrFrequency + proc.getPowerInterface().getFrequency();
-                                        meanMaxFrequency = meanMaxFrequency + proc.getPowerInterface().getLowestPState().getFrequency();
                                 }
                                 meanCurrFrequency = meanCurrFrequency/node.getProcessors().size();
                                 meanMaxFrequency = meanMaxFrequency/node.getProcessors().size();
-                                factor = factor + (meanCurrFrequency /meanMaxFrequency) * (0.5+ nrOfComputingProcessor/node.getProcessors().size());
-                                //System.out.println(meanCurrFrequency + ";" + meanMaxFrequency +  ";" + factor);
+                                factor = factor + (meanCurrFrequency/meanMaxFrequency) * (0.5 + nrOfComputingProcessor/node.getProcessors().size());
                         }
                 }