Changeset 539 for DCWoRMS/trunk/build/classes/example/energy/CPUEnergyEstimationPlugin.java

Timestamp:

10/31/12 13:52:06 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/build/classes/example/energy/CPUEnergyEstimationPlugin.java (modified) (2 diffs)

DCWoRMS/trunk/build/classes/example/energy/CPUEnergyEstimationPlugin.java

@@ -1 +1 @@
 package example.energy;
 
-import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
@@ -14 +13 @@
                         ComputingResource resource) {
                 Processor cpu = (Processor)resource;
-                if(resource.getPowerInterface().getPowerState().getName().equals(StandardPowerStateName.OFF))
+                if(resource.getPowerInterface().getPowerState().equals(StandardPowerStateName.OFF))
                         return 0;
-                if(resource.getStatus() == ResourceStatus.BUSY)
+                else {
                         try {
                                 return cpu.getPowerInterface().getPowerConsumption(cpu.getPowerInterface().getPState());
                         } catch (NoSuchFieldException e) {
-                                return 0;
+                                try {
+                                        return cpu.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON);
+                                } catch (NoSuchFieldException e1) {
+                                }
                         }
-                else 
-                        return 1; 
+                        return 1;
+                }
+
         }
 
-        public String getName() {
-                return getClass().getName();
-        }
-
-
 }