Changeset 497 for DCWoRMS/trunk/src/example/energy

Timestamp:

10/11/12 09:07:11 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/example/energy

Files:

• CPUEnergyEstimationPlugin.java (modified) (2 diffs)
• ComputingNodeEnergyEstimationPlugin.java (modified) (2 diffs)
• DataCenterEnergyEstimationPlugin.java (modified) (1 diff)

DCWoRMS/trunk/src/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();
-        }
-
-
 }

DCWoRMS/trunk/src/example/energy/ComputingNodeEnergyEstimationPlugin.java

@@ -17 +17 @@
                         try{
                                 power = power + cpu.getPowerInterface().getRecentPowerUsage().getValue();
-                        } catch(Exception e){
-                                //power = power + cpu.getPowerInterface().getPowerConsumption(cpu.getPowerInterface().getPowerState());
+                        } catch (Exception e){
+                                
                         }
                 }
-
                 try {
-                        power += node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
+                        power = power + node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
                 } catch (NoSuchFieldException e) {
                 }
@@ -30 +29 @@
         }
 
-        public String getName() {
-                return getClass().getName();
-        }
 
 }

DCWoRMS/trunk/src/example/energy/DataCenterEnergyEstimationPlugin.java

@@ -18 +18 @@
                         power += (powerUsage == null ? 0 : powerUsage.getValue());
                 }
-                
-                //System.out.println( new DateTime() + "ENERGY CONSUMPT BY: " + resMan.getResourceName() +" IS: " + power);
+
                 return power;
         }
 
-        public String getName() {
-                return getClass().getName();
-        }
-
 }