Changeset 707 for DCWoRMS/trunk/src/test/article/recs

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/test/article/recs/plugins/energy

Files:

• AmdNodeEEP.java (modified) (1 diff)
• AtomD510NodeEEP.java (modified) (3 diffs)
• AtomZ510NodeEEP.java (modified) (3 diffs)
• IntelNodeEEP.java (modified) (3 diffs)
• RecsCpuEEP.java (modified) (2 diffs)

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

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

@@ -1 +1 @@
 package test.article.recs.plugins.energy;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
 import schedframe.resources.computing.ComputingNode;
@@ -6 +9 @@
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
 import schedframe.scheduling.manager.tasks.JobRegistry;
-import example.energy.BaseEnergyEstimationPlugin;
 
 public class AtomD510NodeEEP extends RecsNodeBaseEEP {
@@ -14 +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) {
+                        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
+                        e.printStackTrace();
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
                 }
 

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

@@ -1 +1 @@
 package test.article.recs.plugins.energy;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
 import schedframe.resources.computing.ComputingNode;
@@ -6 +9 @@
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
 import schedframe.scheduling.manager.tasks.JobRegistry;
-import example.energy.BaseEnergyEstimationPlugin;
 
 public class AtomZ510NodeEEP extends RecsNodeBaseEEP {
@@ -14 +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) {
+                        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
+                        e.printStackTrace();
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
                 }
 

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

@@ -9 +9 @@
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
 import schedframe.scheduling.manager.tasks.JobRegistry;
-import example.energy.BaseEnergyEstimationPlugin;
 
 public class IntelNodeEEP extends RecsNodeBaseEEP {
@@ -17 +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
@@ -40 +41 @@
                         e.printStackTrace();
                 }
+
                 return powerConsumption;
         }

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

@@ -2 +2 @@
 
 import schedframe.resources.computing.ComputingResource;
+import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
 import schedframe.scheduling.manager.tasks.JobRegistry;
@@ -10 +11 @@
         public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry,
                         ComputingResource resource) {
+                
                 double powerConsumption = 0;
+                Processor cpu = (Processor) resource;
+
+                try {
+                        powerConsumption = cpu.getPowerInterface().getPowerConsumption(cpu.getPowerInterface().getPState());
+                } catch (NoSuchFieldException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+
                 return powerConsumption;
         }