Changeset 707 for DCWoRMS/trunk/src/test/article/recs/plugins/energy/AmdNodeEEP.java

Timestamp:

12/20/12 17:23:27 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/test/article/recs/plugins/energy/AmdNodeEEP.java (modified) (1 diff)

DCWoRMS/trunk/src/test/article/recs/plugins/energy/AmdNodeEEP.java

@@ -16 +16 @@
                 double powerConsumption = 0;
                 ComputingNode node = (ComputingNode) resource;
-                for(Processor cpu: node.getProcessors()){
-                        try{
-                                powerConsumption = powerConsumption + cpu.getPowerInterface().getRecentPowerUsage().getValue();
-                        } catch (Exception e){
-                                
+                try {
+                        if(jobRegistry.getRunningTasks().size() > 0) {
+                                powerConsumption = powerConsumption + getMeasuredPower(createQuery(jobRegistry.getRunningTasks().get(0)));
                         }
-                }
-                try {
-                        powerConsumption = powerConsumption + node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
-                } catch (NoSuchFieldException e) {
-                }
-
-                
-                try {
-                        if(jobRegistry.getRunningTasks().size() > 0)
-                        powerConsumption = powerConsumption + getMeasuredPower(createQuery(jobRegistry.getRunningTasks().get(0)));
+                        else {
+                                for(Processor cpu: node.getProcessors()){
+                                        try{
+                                                //powerConsumption = powerConsumption + cpu.getPowerInterface().getRecentPowerUsage().getValue();
+                                        } catch (Exception e){
+                                                
+                                        }
+                                }
+                                try {
+                                        powerConsumption = powerConsumption + node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
+                                } catch (NoSuchFieldException e) {
+                                }
+                        }
                 } catch (FileNotFoundException e) {
                         // TODO Auto-generated catch block