Changeset 1423 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy

Timestamp:

07/30/14 12:25:00 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy

Files:

• EnergyExtension.java (modified) (3 diffs)
• airthroughput/ui/AirflowInterface.java (modified) (1 diff)
• airthroughput/ui/ComputingResourceAirflowInterface.java (modified) (2 diffs)
• power/PowerProfile.java (modified) (4 diffs)
• power/PowerState.java (modified) (2 diffs)
• power/ui/ComputingResourcePowerInterface.java (modified) (2 diffs)
• power/ui/NodePowerInterface.java (modified) (5 diffs)
• power/ui/PowerInterface.java (modified) (1 diff)
• thermal/ui/ThermalInterface.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/EnergyExtension.java

@@ -111 +111 @@
                 if(powerProfile == null || powerProfile.getEnergyEstimationPlugin() == null)
                         return false;
-                if(event.getType().getName().equals(ResourceEventType.POWER_STATE_CHANGED.getName()))
+                if(event.getType().getName().equals(ResourceEventType.UTILIZATION_CHANGED.getName()))
+                        return true;
+                else if(event.getType().getName().equals(ResourceEventType.TASK_STARTED.getName()))
+                        return true;
+                else if(event.getType().getName().equals(ResourceEventType.TASK_FINISHED.getName()))
+                        return true;
+                else if(event.getType().getName().equals(ResourceEventType.POWER_STATE_CHANGED.getName()))
                         return true;
                 else if(event.getType().getName().equals(ResourceEventType.CPU_FREQUENCY_CHANGED.getName()))
                         return true;
-                else if(event.getType().getName().equals(ResourceEventType.TASK_STARTED.getName()))
-                        return true;
-                else if(event.getType().getName().equals(ResourceEventType.TASK_FINISHED.getName()))
-                        return true;
-                else if(event.getType().getName().equals(ResourceEventType.UTILIZATION_CHANGED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.UPDATE_POWER_STATE.getName()))
                         return true;
         
@@ -138 +140 @@
                         switch (resEvent.getType()) {
                         
-                        case UPDATE_POWER_STATE:
-                                PowerStateName newPowerState = (PowerStateName) resEvent.getData();
-                                powerInterface.setPowerState(newPowerState);
-                                break;
-                                
+                        case UTILIZATION_CHANGED:
+                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                status = powerProfile.addToPowerUsageHistory(power);
+                                break;
+                                
+                        case TASK_STARTED:
+                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                status = powerProfile.addToPowerUsageHistory(power);
+                                break;
+        
+                        case TASK_FINISHED:
+                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                status = powerProfile.addToPowerUsageHistory(power);
+                                break;
+                                                                
                         case POWER_STATE_CHANGED:
                                 power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);                     
@@ -153 +165 @@
                                 break;
                                 
-                        case TASK_STARTED:
-                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
-                                status = powerProfile.addToPowerUsageHistory(power);
-                                break;
-        
-                        case TASK_FINISHED:
-                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
-                                status = powerProfile.addToPowerUsageHistory(power);
-                                break;
-                                
-                        case UTILIZATION_CHANGED:
-                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
-                                status = powerProfile.addToPowerUsageHistory(power);
+                        case UPDATE_POWER_STATE:
+                                if(resource.getFullName().equals(resEvent.getSource())){
+                                        PowerStateName newPowerState = (PowerStateName) resEvent.getData();
+                                        powerInterface.setPowerState(newPowerState);
+                                }
                                 break;
                                 

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/airthroughput/ui/AirflowInterface.java

@@ -24 +24 @@
         public AirflowValue getRecentAirflow();
         
-        List<AirflowValue> getAirflowHistory();
+        public List<AirflowValue> getAirflowHistory();
         
         public Parameters getParameters();

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/airthroughput/ui/ComputingResourceAirflowInterface.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.airthroughput.ui;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -54 +53 @@
 
         public List<AirflowState> getSupportedAirflowStates() {
-                List<AirflowState> airflowStates = new ArrayList<AirflowState>();
-                for(AirflowState airflowState: airflowProfile.getAirflowStates()){
-                        airflowStates.add(airflowState);
-                }
-                return airflowStates;
+                return airflowProfile.getAirflowStates();
         }
 

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerProfile.java

@@ -64 +64 @@
         public List<PowerState> getSupportedPowerStates() {
                 if(supportedPowerStates == null)
-                        return new ArrayList<PowerState>();
+                        return new ArrayList<PowerState>(0);
                 return supportedPowerStates;
         }
@@ -70 +70 @@
         public Map<String, PState> getSupportedPStates() {
                 if(supportedPStates == null)
-                        return new HashMap<String, PState>();
+                        return new HashMap<String, PState>(0);
                 return supportedPStates;
         }
@@ -117 +117 @@
                 boolean supportsOFF = false;
                 if(supportedPowerStates == null){
-                        supportedPowerStates = new ArrayList<PowerState>();
+                        supportedPowerStates = new ArrayList<PowerState>(4);
                 }
                 for(PowerState ps: supportedPowerStates){
@@ -128 +128 @@
                 
                 if(!supportsON){
-                        supportedPowerStates.add(new PowerState(StandardPowerStateName.ON, -1, new ArrayList<Transition>()));
+                        supportedPowerStates.add(new PowerState(StandardPowerStateName.ON, -1, null));
+                        supportedPowerStates.add(new PowerState(StandardPowerStateName.BOOT, -1, null));
                 }
                 if(!supportsOFF){
-                        supportedPowerStates.add(new PowerState(StandardPowerStateName.OFF, -1, new ArrayList<Transition>()));
+                        supportedPowerStates.add(new PowerState(StandardPowerStateName.OFF, -1, null));
+                        supportedPowerStates.add(new PowerState(StandardPowerStateName.POWEROFF, -1, null));
                 }
         }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerState.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -24 +25 @@
         }
         public List<Transition> getTransitions() {
+                if(transitions == null)
+                        return new ArrayList<Transition>(0);
                 return transitions;
         }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/ComputingResourcePowerInterface.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power.ui;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -65 +64 @@
 
         public List<PowerState> getSupportedPowerStates(){
-                List<PowerState> powerStates = new ArrayList<PowerState>();
-                for(PowerState powerState: powerProfile.getSupportedPowerStates()){
-                        powerStates.add(powerState);
-                }
-                return powerStates;
+                return powerProfile.getSupportedPowerStates();
         }
 

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/NodePowerInterface.java

@@ -4 +4 @@
 
 import java.util.List;
+
 
 import schedframe.resources.ResourceStatus;
@@ -37 +38 @@
                         }
 
-                        if(state == StandardPowerStateName.OFF){
+                        if(state == StandardPowerStateName.OFF || state == StandardPowerStateName.POWEROFF){
                                 node.setStatus(ResourceStatus.UNAVAILABLE);
                         }
-                        else if(state == StandardPowerStateName.ON){
+                        else if(state == StandardPowerStateName.ON || state == StandardPowerStateName.BOOT){
                                 node.setStatus(ResourceStatus.FREE);
                         }
@@ -55 +56 @@
                 /*double timePenalty = getTransitionTime(currentPowerState, StandardPowerStateName.ON);
                 setPowerState(StandardPowerStateName.BOOT);
-                DataCenterWorkloadSimulator.getEventManager().sendToResource(resource.getFullName(), timePenalty, new ResourceEvent(ResourceEventType.UPDATE_POWER_STATE, StandardPowerStateName.ON, resource.getFullName()));*/
+                DataCenterWorkloadSimulator.getEventManager().sendToResource(resource.getFullName(), timePenalty, new ResourceEvent(ResourceEventType.UPDATE_POWER_STATE, StandardPowerStateName.ON, resource.getFullName()));
+                 */             
                 setPowerState(StandardPowerStateName.ON);
         }
@@ -68 +70 @@
         private double getTransitionTime(PowerStateName from, PowerStateName to){
                 List<PowerState> availablePowerStates = getSupportedPowerStates();
-                double timePenalty = 0;
+                double time = 0;
                 for(PowerState ps : availablePowerStates){
                         if(ps.getName().getLabel().equals(from.getLabel())){
@@ -74 +76 @@
                                 for(Transition t: transitions){
                                         if(t.getTo().getLabel().equals(to)){
-                                                timePenalty = t.getTime();
+                                                time = t.getTime();
                                         }
                                 }
                         }
                 }
-                return timePenalty;
+                return time;
         }
 

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/PowerInterface.java

@@ -24 +24 @@
         //public double getCurrentPowerConsumption();
         
-        List<PowerUsage> getPowerUsageHistory();
+        public List<PowerUsage> getPowerUsageHistory();
         
         public Parameters getParameters();

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/thermal/ui/ThermalInterface.java

@@ -10 +10 @@
         public TemperatureValue getRecentTemperature();
         
-        List<TemperatureValue> getTemperatureHistory();
+        public List<TemperatureValue> getTemperatureHistory();
         
         public Parameters getParameters();