Changeset 1415 for DCWoRMS/branches/coolemall/src/schedframe/resources

Timestamp:

07/15/14 16:26:31 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources

Files:

• computing/ComputingResource.java (modified) (7 diffs)
• computing/profiles/energy/EnergyException.java (deleted)
• computing/profiles/energy/EnergyExtension.java (modified) (4 diffs)
• computing/profiles/energy/ResourceEvent.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/EnergyEvent.java) (3 diffs)
• computing/profiles/energy/ResourceEventType.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/EnergyEventType.java) (1 diff)
• computing/profiles/energy/airthroughput/ui/ComputingResourceAirflowInterface.java (modified) (2 diffs)
• computing/profiles/energy/power/StandardPowerStateName.java (modified) (1 diff)
• computing/profiles/energy/power/plugin/EnergyEstimationPlugin.java (modified) (2 diffs)
• computing/profiles/energy/power/plugin/EnergyPluginConfiguration.java (added)
• computing/profiles/energy/power/ui/ComputingResourcePowerInterface.java (modified) (2 diffs)
• computing/profiles/energy/power/ui/NodePowerInterface.java (modified) (4 diffs)
• computing/profiles/energy/power/ui/ProcessorPowerInterface.java (modified) (3 diffs)
• computing/profiles/load/LoadExtension.java (modified) (5 diffs)
• computing/profiles/load/plugin/LoadEstimationPlugin.java (modified) (2 diffs)
• devices/Device.java (modified) (5 diffs)
• devices/DeviceAirflowInterface.java (modified) (2 diffs)
• devices/DevicePowerInterface.java (modified) (2 diffs)
• devices/Fan.java (modified) (2 diffs)
• devices/PhysicalResource.java (modified) (2 diffs)
• devices/description/PhysicalResourceDescription.java (modified) (2 diffs)
• units/StandardResourceUnitName.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingResource.java

@@ -9 +9 @@
 import java.util.Properties;
 
-import schedframe.events.Event;
 import schedframe.events.EventHandler;
+import schedframe.events.EventReason;
 import schedframe.events.ResourceEventCommand;
-import schedframe.events.scheduling.EventReason;
 import schedframe.events.scheduling.ResourceStateChangedEvent;
 import schedframe.events.scheduling.SchedulingEvent;
@@ -21 +20 @@
 import schedframe.resources.computing.extensions.Extension;
 import schedframe.resources.computing.extensions.ExtensionListImpl;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
 import schedframe.resources.computing.profiles.load.LoadExtension;
@@ -117 +116 @@
         }
         
-        private void triggerEventUp(Event event) {
+        private void triggerEventUp(ResourceEvent event) {
                 if(parent != null)
                         parent.handleEvent(event);
         }
 
-        public void handleEvent(Event event){
+        public void handleEvent(ResourceEvent event){
                 ResourceEventCommand rec = new ResourceEventCommand(this);
                 rec.execute(event);
@@ -227 +226 @@
         class ComputingResourceEventHandler implements EventHandler{
                 
-                public void handleResourceEvent(Event event){
+                public void handleResourceEvent(ResourceEvent event){
                         if (extensionList != null) {
                                 for (Extension extension: extensionList) {
@@ -254 +253 @@
                                 //scheduler.sim_cancel(filter, null);
                                 ResourceStateChangedEvent rscEvent = (ResourceStateChangedEvent) event;
-                                EnergyEventType eeType = (EnergyEventType)rscEvent.getEventType();
+                                ResourceEventType reType = rscEvent.getResourceEventType();
                                 //scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
-                                switch(eeType){
+                                switch(reType){
                                 
-                                        case RESOURCE_UTILIZATION_CHANGED: {
+                                        case UTILIZATION_CHANGED: {
                                                 scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
                                                 break;
                                         }
-                                        case FREQUENCY_CHANGED: {
+                                        case CPU_FREQUENCY_CHANGED: {
                                                 scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
                                                 break;
@@ -286 +285 @@
                 }
                 ResourceEventCommand rec = new ResourceEventCommand(this);
-                EnergyEvent event = new EnergyEvent(EnergyEventType.AIRFLOW_STATE_CHANGED, "Resource controller");
+                ResourceEvent event = new ResourceEvent(ResourceEventType.AIRFLOW_STATE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
                 rec.execute(event);
                 /*ResourceEventCommand*/ rec = new ResourceEventCommand(this);
-                /*EnergyEvent*/ event = new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, "Resource controller");
+                /*ResourceEvent*/ event = new ResourceEvent(ResourceEventType.POWER_STATE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
                 rec.execute(event);
                 
                 rec = new ResourceEventCommand(this);
-                event = new EnergyEvent(EnergyEventType.TEMPERATURE_CHANGED, "Resource controller");
+                event = new ResourceEvent(ResourceEventType.TEMPERATURE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
                 rec.execute(event);
@@ -302 +301 @@
                 if(li != null){
                         ResourceLoadCalendar rlc = li.getLoadCalendar();
-                        LinkedList<TimestampUtilization> ll = rlc.getLoadDistribution();
-                        for(TimestampUtilization tu: ll){
-                                DataCenterWorkloadSimulator.getEventManager().sendToResource(getFullName(), tu.getStartTime(), new EnergyEvent(EnergyEventType.RESOURCE_UTILIZATION_CHANGED, getFullName()));
-                                DataCenterWorkloadSimulator.getEventManager().sendToResource(getFullName(), tu.getEndTime(), new EnergyEvent(EnergyEventType.RESOURCE_UTILIZATION_CHANGED, getFullName()));
+                        LinkedList<TimestampUtilization> ld = rlc.getLoadDistribution();
+                        for(TimestampUtilization tu: ld){
+                                DataCenterWorkloadSimulator.getEventManager().sendToResource(getFullName(), tu.getStartTime(), new ResourceEvent(ResourceEventType.UTILIZATION_CHANGED, getFullName()));
+                                DataCenterWorkloadSimulator.getEventManager().sendToResource(getFullName(), tu.getEndTime(), new ResourceEvent(ResourceEventType.UTILIZATION_CHANGED, getFullName()));
                         }                                       
                 }

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

@@ -15 +15 @@
 import schedframe.resources.computing.profiles.energy.power.PowerInterfaceFactory;
 import schedframe.resources.computing.profiles.energy.power.PowerProfile;
+import schedframe.resources.computing.profiles.energy.power.PowerStateName;
 import schedframe.resources.computing.profiles.energy.power.ui.PowerInterface;
 import schedframe.resources.computing.profiles.energy.thermal.ThermalInterfaceFactory;
@@ -110 +111 @@
                 if(powerProfile == null || powerProfile.getEnergyEstimationPlugin() == null)
                         return false;
-                if(event.getType().getName().equals(EnergyEventType.POWER_STATE_CHANGED.getName()))
-                        return true;
-                else if(event.getType().getName().equals(EnergyEventType.FREQUENCY_CHANGED.getName()))
-                        return true;
-                else if(event.getType().getName().equals(EnergyEventType.TASK_STARTED.getName()))
-                        return true;
-                else if(event.getType().getName().equals(EnergyEventType.TASK_FINISHED.getName()))
-                        return true;
-                else if(event.getType().getName().equals(EnergyEventType.RESOURCE_UTILIZATION_CHANGED.getName()))
-                        return true;
-        
-                if(event.getType().getName().equals(EnergyEventType.AIRFLOW_STATE_CHANGED.getName()))
-                        return true;
-                if(event.getType().getName().equals(EnergyEventType.TEMPERATURE_CHANGED.getName()))
+                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()))
+                        return true;
+        
+                if(event.getType().getName().equals(ResourceEventType.AIRFLOW_STATE_CHANGED.getName()))
+                        return true;
+                if(event.getType().getName().equals(ResourceEventType.TEMPERATURE_CHANGED.getName()))
                         return true;
                 
@@ -131 +132 @@
         public void handleEvent(Event event) {
                 
-                EnergyEvent enEvent = (EnergyEvent)event;
+                ResourceEvent resEvent = (ResourceEvent)event;
                 double power = 0;
                 boolean status = false;
                 try{
-                        switch (enEvent.getType()) {
+                        switch (resEvent.getType()) {
                         
+                        case UPDATE_POWER_STATE:
+                                PowerStateName newPowerState = (PowerStateName) resEvent.getData();
+                                powerInterface.setPowerState(newPowerState);
+                                break;
+                                
                         case POWER_STATE_CHANGED:
-                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(enEvent, new JobRegistryImpl(resource.getFullName()), resource);                      
-                                status = powerProfile.addToPowerUsageHistory(power);
-                                break;
-                                
-                        case FREQUENCY_CHANGED:
-                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);                     
+                                status = powerProfile.addToPowerUsageHistory(power);
+                                break;
+                                
+                        case CPU_FREQUENCY_CHANGED:
+                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
                                 status = powerProfile.addToPowerUsageHistory(power);
                                 break;
                                 
                         case TASK_STARTED:
-                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
                                 status = powerProfile.addToPowerUsageHistory(power);
                                 break;
         
                         case TASK_FINISHED:
-                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
-                                status = powerProfile.addToPowerUsageHistory(power);
-                                break;
-                                
-                        case RESOURCE_UTILIZATION_CHANGED:
-                                power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                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);
                                 break;
                                 
                         case AIRFLOW_STATE_CHANGED:
-                                double airflow = powerProfile.getEnergyEstimationPlugin().estimateAirflow(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                double airflow = powerProfile.getEnergyEstimationPlugin().estimateAirflow(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
                                 airflowProfile.addToAirFlowHistory(airflow);
                                 break;
                                 
                         case TEMPERATURE_CHANGED:
-                                double temperature = powerProfile.getEnergyEstimationPlugin().estimateTemperature(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
+                                double temperature = powerProfile.getEnergyEstimationPlugin().estimateTemperature(resEvent, new JobRegistryImpl(resource.getFullName()), resource);
                                 thermalProfile.addToTemperatureHistory(temperature);
                                 break;
@@ -176 +182 @@
                 }
                 if(status){
-                        DataCenterWorkloadSimulator.getEventManager().sendToResources(resource.getType(), 0, new EnergyEvent(EnergyEventType.TEMPERATURE_CHANGED, resource.getFullName()));
+                        DataCenterWorkloadSimulator.getEventManager().sendToResources(resource.getType(), 0, new ResourceEvent(ResourceEventType.TEMPERATURE_CHANGED, resource.getFullName()));
                 }
         }

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

@@ -2 +2 @@
 
 import schedframe.events.Event;
+import schedframe.events.EventReason;
 import schedframe.events.EventType;
-import schedframe.events.scheduling.EventReason;
 
 
-public class EnergyEvent implements Event{
+public class ResourceEvent implements Event{
 
         protected EventType type;
         protected EventReason reason;
+        protected String source;
         protected Object data;
-        protected String source;
 
-        public EnergyEvent(EventType eventType, String source){
+        public ResourceEvent(EventType eventType, String source){
                 this.type = eventType;
                 this.source = source;
@@ -19 +19 @@
         }
         
-        public EnergyEvent(EventType eventType, Object data, String source){
+        public ResourceEvent(EventType eventType, Object data, String source){
                 this.type = eventType;
                 this.data = data;
@@ -26 +26 @@
         }
         
-        public EnergyEventType getType() {
-                EnergyEventType enEventType = null; 
+        public ResourceEventType getType() {
+                ResourceEventType resEventType; 
                 try{
-                        enEventType = (EnergyEventType)type;
+                        resEventType = (ResourceEventType)type;
                 } catch(Exception e){
-
+                        resEventType = null; 
                 }
-                return enEventType;
-
-        }
-
-        public int getTag() {
-                return type.getTag();
+                return resEventType;
         }
 

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

@@ -3 +3 @@
 import schedframe.events.EventType;
 
-public enum EnergyEventType implements EventType {
+public enum ResourceEventType implements EventType {
         
-        TASK_FINISHED(1),
-        TASK_FAILED(2),
-        TASK_CANCELED(4),
-        TASK_STARTED(8),
+        TASK_STARTED,
+        TASK_FINISHED,
 
-        TIMER(16),
+        POWER_STATE_CHANGED,
+        CPU_FREQUENCY_CHANGED,
+        AIRFLOW_STATE_CHANGED,
+        
+        UTILIZATION_CHANGED,
+        
+        TEMPERATURE_CHANGED,
+        
+        UPDATE_POWER_STATE;
 
-        POWER_STATE_CHANGED(32),
-        FREQUENCY_CHANGED(64),
-        
-        AIRFLOW_STATE_CHANGED(256),
-        
-        RESOURCE_FAILED(512),
-        
-        RESOURCE_UTILIZATION_CHANGED(1024),
-        
-        TEMPERATURE_CHANGED(2048)
-        
-        ;
-
-        protected int tag;
-        
-        public int getTag() {
-                return tag;
-        }
-
-        private EnergyEventType(int tag){
-                this.tag = tag;
-        }
-        
         public String getName(){
                 return toString();

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

@@ -8 +8 @@
 import schedframe.Parameters;
 import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirflowValue;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirflowProfile;
@@ -37 +37 @@
                         
                         //TO DO - notifications should be called for all resources starting form the lowest layer
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.AIRFLOW_STATE_CHANGED, resource.getFullName()));
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getFullName()));
+                        resource.handleEvent(new ResourceEvent(ResourceEventType.AIRFLOW_STATE_CHANGED, resource.getFullName()));
+                        resource.handleEvent(new ResourceEvent(ResourceEventType.POWER_STATE_CHANGED, resource.getFullName()));
                         return true;
                 }

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

@@ -8 +8 @@
         SLEEP,
         SUSPEND,
-        HIBERNATE;
+        HIBERNATE,
+        BOOT,
+        POWEROFF;
 
         public String getLabel() {

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

@@ -2 +2 @@
 
 import schedframe.Plugin;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
 import schedframe.resources.devices.PhysicalResource;
 import schedframe.scheduling.manager.tasks.JobRegistry;
@@ -8 +8 @@
 public interface EnergyEstimationPlugin extends Plugin {
         
-        public double estimatePowerConsumption(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);
+        public double estimatePowerConsumption(ResourceEvent event, JobRegistry jobRegistry, PhysicalResource resource);
 
-        public double estimateAirflow(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);
+        public double estimateAirflow(ResourceEvent event, JobRegistry jobRegistry, PhysicalResource resource);
 
-        public double estimateTemperature(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);
+        public double estimateTemperature(ResourceEvent event, JobRegistry jobRegistry, PhysicalResource resource);
 
 }

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

@@ -9 +9 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.energy.power.PowerProfile;
 import schedframe.resources.computing.profiles.energy.power.PowerState;
@@ -49 +49 @@
                         }
                         //notifications from all levels
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getFullName()));
+                        resource.handleEvent(new ResourceEvent(ResourceEventType.POWER_STATE_CHANGED, resource.getFullName()));
 
                         //notification from last level

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

@@ -3 +3 @@
 
 
+import java.util.List;
+
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Node;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.energy.power.PowerProfile;
+import schedframe.resources.computing.profiles.energy.power.PowerState;
 import schedframe.resources.computing.profiles.energy.power.PowerStateName;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
+import schedframe.resources.computing.profiles.energy.power.Transition;
+import simulator.DataCenterWorkloadSimulator;
 
 public class NodePowerInterface extends ComputingResourcePowerInterface{
@@ -26 +31 @@
                         
                         Node node = (Node) resource;
-                        for(ComputingResource child:node.getProcessors()){
+                        for(ComputingResource child: node.getProcessors()){
                                 if(child.getPowerInterface() != null){
                                         child.getPowerInterface().setPowerState(state); 
@@ -39 +44 @@
                         }
         
-                        node.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, node.getFullName()));
+                        node.handleEvent(new ResourceEvent(ResourceEventType.POWER_STATE_CHANGED, node.getFullName()));
 
                         //node.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getName()));
@@ -48 +53 @@
 
         public void turnOn(){
+                /*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()));*/
                 setPowerState(StandardPowerStateName.ON);
         }
         
         public void turnOff(){
+                /*double timePenalty = getTransitionTime(currentPowerState, StandardPowerStateName.OFF);
+                setPowerState(StandardPowerStateName.POWEROFF);
+                DataCenterWorkloadSimulator.getEventManager().sendToResource(resource.getFullName(), timePenalty, new ResourceEvent(ResourceEventType.UPDATE_POWER_STATE, StandardPowerStateName.OFF, resource.getFullName()));*/
                 setPowerState(StandardPowerStateName.OFF);
         }
 
+        private double getTransitionTime(PowerStateName from, PowerStateName to){
+                List<PowerState> availablePowerStates = getSupportedPowerStates();
+                double timePenalty = 0;
+                for(PowerState ps : availablePowerStates){
+                        if(ps.getName().getLabel().equals(from.getLabel())){
+                                List<Transition> transitions = ps.getTransitions();
+                                for(Transition t: transitions){
+                                        if(t.getTo().getLabel().equals(to)){
+                                                timePenalty = t.getTime();
+                                        }
+                                }
+                        }
+                }
+                return timePenalty;
+        }
 
 

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

@@ -6 +6 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.energy.power.PState;
 import schedframe.resources.computing.profiles.energy.power.PowerProfile;
@@ -33 +33 @@
                                 resource.setStatus(ResourceStatus.FREE);
                         }
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getFullName()));             
+                        resource.handleEvent(new ResourceEvent(ResourceEventType.POWER_STATE_CHANGED, resource.getFullName()));         
                 }
 
@@ -67 +67 @@
                         //speed.setAmount(Double.valueOf(currentPState.getFrequency()).intValue());
                         //new ResourceEventCommand(resource).execute(EnergyEventType.FREQUENCY_CHANGED);
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.FREQUENCY_CHANGED, resource.getFullName()));
+                        resource.handleEvent(new ResourceEvent(ResourceEventType.CPU_FREQUENCY_CHANGED, resource.getFullName()));
                         //resource.getScheduler().sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE, resource.getName());
                         

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/load/LoadExtension.java

@@ -7 +7 @@
 import schedframe.resources.computing.extensions.ExtensionException;
 import schedframe.resources.computing.extensions.ExtensionType;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.load.ui.LoadInterface;
 import schedframe.resources.devices.PhysicalResource;
@@ -29 +29 @@
                 if(loadProfile == null || loadProfile.getLoadEstimationPlugin() == null)
                         return false;
-                if(event.getType().getName().equals(EnergyEventType.POWER_STATE_CHANGED.getName()))
+                if(event.getType().getName().equals(ResourceEventType.POWER_STATE_CHANGED.getName()))
                         return true;
-                else if(event.getType().getName().equals(EnergyEventType.FREQUENCY_CHANGED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.CPU_FREQUENCY_CHANGED.getName()))
                         return true;
-                else if(event.getType().getName().equals(EnergyEventType.TASK_STARTED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.TASK_STARTED.getName()))
                         return true;
-                else if(event.getType().getName().equals(EnergyEventType.TASK_FINISHED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.TASK_FINISHED.getName()))
                         return true;
-                else if(event.getType().getName().equals(EnergyEventType.RESOURCE_UTILIZATION_CHANGED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.UTILIZATION_CHANGED.getName()))
                         return true;            
                 else return false;
@@ -44 +44 @@
         public void handleEvent(Event event) {
                 
-                EnergyEvent enEvent = (EnergyEvent)event;
+                ResourceEvent enEvent = (ResourceEvent)event;
                 double load = 0;
                 try{
@@ -54 +54 @@
                                 break;
                                 
-                        case FREQUENCY_CHANGED:
+                        case CPU_FREQUENCY_CHANGED:
                                 load = loadProfile.getLoadEstimationPlugin().estimateUtlization(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
                                 loadProfile.addToLoadHistory(load);
@@ -69 +69 @@
                                 break;
                                 
-                        case RESOURCE_UTILIZATION_CHANGED:
+                        case UTILIZATION_CHANGED:
                                 load = loadProfile.getLoadEstimationPlugin().estimateUtlization(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
                                 loadProfile.addToLoadHistory(load);

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/load/plugin/LoadEstimationPlugin.java

@@ -2 +2 @@
 
 import schedframe.Plugin;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
 import schedframe.resources.devices.PhysicalResource;
 import schedframe.scheduling.manager.tasks.JobRegistry;
@@ -8 +8 @@
 public interface LoadEstimationPlugin extends Plugin {
         
-        public double estimateUtlization(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);
+        public double estimateUtlization(ResourceEvent event, JobRegistry jobRegistry, PhysicalResource resource);
 
 

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/Device.java

@@ -1 +1 @@
 package schedframe.resources.devices;
 
-import schedframe.events.Event;
 import schedframe.events.EventHandler;
+import schedframe.events.EventReason;
 import schedframe.events.ResourceEventCommand;
-import schedframe.events.scheduling.EventReason;
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
@@ -11 +10 @@
 import schedframe.resources.computing.extensions.Extension;
 import schedframe.resources.computing.extensions.ExtensionListImpl;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
 import schedframe.resources.devices.description.DeviceDescription;
@@ -44 +43 @@
         }
 
-        public void handleEvent(Event event) {
+        public void handleEvent(ResourceEvent event) {
                 ResourceEventCommand rec = new ResourceEventCommand(this);
                 rec.execute(event);
@@ -51 +50 @@
         class DeviceEventHandler implements EventHandler{
                 
-                public void handleResourceEvent(Event event){
+                public void handleResourceEvent(ResourceEvent event){
                         if (extensionList != null) {
                                 for (Extension extension : extensionList) {
@@ -75 +74 @@
                 
                 ResourceEventCommand rec = new ResourceEventCommand(this);
-                EnergyEvent event = new EnergyEvent(EnergyEventType.AIRFLOW_STATE_CHANGED, "Resource controller");
+                ResourceEvent event = new ResourceEvent(ResourceEventType.AIRFLOW_STATE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
                 rec.execute(event);
                 
                 rec = new ResourceEventCommand(this);
-                event = new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, "Resource controller");
+                event = new ResourceEvent(ResourceEventType.POWER_STATE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
                 rec.execute(event);
                 
                 rec = new ResourceEventCommand(this);
-                event = new EnergyEvent(EnergyEventType.TEMPERATURE_CHANGED, "Resource controller");
+                event = new ResourceEvent(ResourceEventType.TEMPERATURE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
                 rec.execute(event);

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/DeviceAirflowInterface.java

@@ -7 +7 @@
 
 import schedframe.Parameters;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirflowValue;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirflowProfile;
@@ -37 +37 @@
                         
                         //TO DO - notifications should be called for all resources starting form the lowest layer
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.AIRFLOW_STATE_CHANGED, resource.getFullName()));
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getFullName()));
+                        resource.handleEvent(new ResourceEvent(ResourceEventType.AIRFLOW_STATE_CHANGED, resource.getFullName()));
+                        resource.handleEvent(new ResourceEvent(ResourceEventType.POWER_STATE_CHANGED, resource.getFullName()));
                         return true;
                 }

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/DevicePowerInterface.java

@@ -7 +7 @@
 
 import schedframe.Parameters;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.energy.power.PowerProfile;
 import schedframe.resources.computing.profiles.energy.power.PowerState;
@@ -32 +32 @@
                         currentPowerState = state;
 
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getFullName()));
+                        resource.handleEvent(new ResourceEvent(ResourceEventType.POWER_STATE_CHANGED, resource.getFullName()));
 
                         return true;

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/Fan.java

@@ -4 +4 @@
 import java.util.List;
 
+import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.devices.description.DeviceDescription;
 
@@ -12 +13 @@
         public Fan(DeviceDescription devDesc) {
                 super(devDesc);
-                this.chilledResources = new ArrayList<String>();
         }
         
         public List<String> getChilledResources(){
+                if(chilledResources == null){
+                        List<String> resNames =  new ArrayList<String>();
+                        for(ComputingResource compRes: this.getComputingResource().getChildren()){
+                                resNames.add(compRes.getFullName());
+                        }
+                        return resNames;
+                }
                 return chilledResources;
         }

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/PhysicalResource.java

@@ -12 +12 @@
 import schedframe.resources.computing.extensions.ExtensionType;
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
 import schedframe.resources.computing.profiles.energy.airthroughput.ui.AirflowInterface;
 import schedframe.resources.computing.profiles.energy.power.ui.PowerInterface;
@@ -28 +29 @@
 
         
-        public abstract void handleEvent(Event event);
+        public abstract void handleEvent(ResourceEvent event);
         
         public abstract EventHandler getEventHandler();

DCWoRMS/branches/coolemall/src/schedframe/resources/devices/description/PhysicalResourceDescription.java

@@ -30 +30 @@
 import schemas.PowerUsage;
 import schemas.Profile;
+import schemas.StringValueWithUnit;
 import simulator.utils.InstanceFactory;
 import example.energy.DefaultEnergyEstimationPlugin;
@@ -82 +83 @@
                                 }
                                 Parameters params = extractParameters(powerProfileCharacteristic.getEnergyEstimationPlugin().getParameter());
+                                if(powerProfileCharacteristic.getEnergyEstimationPlugin().getPowerCapLevel() != null) {
+                                        Parameter param = new Parameter("powerCapLevel");
+                                        StringValueWithUnit sv = new StringValueWithUnit();
+                                        sv.setContent(String.valueOf(powerProfileCharacteristic.getEnergyEstimationPlugin().getPowerCapLevel().getContent()));
+                                        sv.setUnit(powerProfileCharacteristic.getEnergyEstimationPlugin().getPowerCapLevel().getUnit());
+                                        param.add(sv);
+                                        
+                                        if(params == null)
+                                                params = new Parameters();
+                                        params.put("powerCapLevel", param);
+                                }
+                                if(powerProfileCharacteristic.getEnergyEstimationPlugin().getPowerFloorLevel() != null) {
+                                        Parameter param = new Parameter("powerFloorLevel");
+                                        StringValueWithUnit sv = new StringValueWithUnit();
+                                        sv.setContent(String.valueOf(powerProfileCharacteristic.getEnergyEstimationPlugin().getPowerFloorLevel().getContent()));
+                                        sv.setUnit(powerProfileCharacteristic.getEnergyEstimationPlugin().getPowerFloorLevel().getUnit());
+                                        param.add(sv);
+                                        
+                                        if(params == null)
+                                                params = new Parameters();
+                                        params.put("powerFloorLevel", param);
+                                }
                                 energyEstimationPlugin.init(params);
                         }

DCWoRMS/branches/coolemall/src/schedframe/resources/units/StandardResourceUnitName.java

@@ -37 +37 @@
     COST("cost"),
     
-    PE("processingElement");
+    PE("processingelement");