Changeset 886 for DCWoRMS/branches/coolemall/src/example/energy/recs/ProcessorEnergyEstimationPlugin.java

Timestamp:

02/26/13 10:05:45 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/example/energy/recs/ProcessorEnergyEstimationPlugin.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package example.energy.recs;
 
-import example.energy.BaseEnergyEstimationPlugin;
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
 import schedframe.scheduling.manager.tasks.JobRegistry;
+import example.energy.BaseEnergyEstimationPlugin;
 
 public class ProcessorEnergyEstimationPlugin extends BaseEnergyEstimationPlugin  {
@@ -21 +20 @@
                         try {
                                 if(resource.getStatus() == ResourceStatus.BUSY)
-                                        powerConsumption = 60;
-                                        //powerConsumption = cpu.getPowerInterface().getPowerConsumption(cpu.getPowerInterface().getPState());
+                                        powerConsumption = cpu.getPowerInterface().getPowerConsumption(cpu.getPowerInterface().getPState());
                                 else {
-                                        powerConsumption = 10;
-                                        //powerConsumption = cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
+                                        powerConsumption = cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
                                 }
-                        } catch (Exception e) {
+                        } catch (NoSuchFieldException e) {
                                 try {
                                         powerConsumption = cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
@@ -35 +32 @@
                         }
                 }
-                if(event.getType() == EnergyEventType.RESOURCE_UTILIZATION_CHANGED)
-                        powerConsumption = powerConsumption/2;
                 return powerConsumption;
         }