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

Timestamp:

11/26/13 11:56:07 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• LoadPowerUsage.java (added)
• PState.java (modified) (6 diffs)
• PowerInterfaceFactory.java (modified) (1 diff)
• PowerProfile.java (modified) (4 diffs)
• plugin/EnergyEstimationPlugin.java (modified) (1 diff)
• ui/ComputingNodePowerInterface.java (modified) (3 diffs)
• ui/ComputingResourcePowerInterface.java (modified) (3 diffs)
• ui/DataCenterPowerInterface.java (modified) (2 diffs)
• ui/ProcessorPowerInterface.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power;
+
+import java.util.Map;
+import java.util.TreeMap;
 
 public class PState {
@@ -9 +12 @@
         protected double powerUsageMin;
         protected double powerUsageMax;
-
+        //protected List<LoadPowerUsage> loadPowerUsageList;
+        protected Map<Double, Double> loadPowerUsage;
+        
         /*public PState(PStateType name, double frequency, double voltage, double power) {
                 super();
@@ -38 +43 @@
                 return powerUsageMax;
         }
-        
+        /*public List<LoadPowerUsage> getLoadPowerUsageList() {
+                return loadPowerUsageList;
+        }*/
+        public Map<Double, Double> getLoadPowerUsage() {
+                if(loadPowerUsage == null) {
+                        return new TreeMap<Double, Double>();
+                }
+                return loadPowerUsage;
+        }
+
         public static class Builder {
           
@@ -47 +61 @@
                 protected double powerUsageMin;
                 protected double powerUsageMax;
+                //protected List<LoadPowerUsage> loadPowerUsageList = new ArrayList<LoadPowerUsage>();
+                protected Map<Double, Double> loadPowerUsage = new TreeMap<Double, Double>();
                 
                 public Builder name(String name){this.name = name; return this; }
@@ -54 +70 @@
         public Builder powerUsageMin(double rate){this.powerUsageMin = rate; return this; }
         public Builder powerUsageMax(double rate){this.powerUsageMax = rate; return this; }
+        //public Builder loadPowerUsage(LoadPowerUsage lpu){this.loadPowerUsageList.add(lpu); return this; }
+        public Builder loadPowerUsage(double load, double power){this.loadPowerUsage.put(load, power); return this; }
         
         public PState build() {
@@ -67 +85 @@
                 this.powerUsageMin = builder.powerUsageMin;
                 this.powerUsageMax = builder.powerUsageMax;
+                //this.loadPowerUsageList = builder.loadPowerUsageList;
+                this.loadPowerUsage = builder.loadPowerUsage;
         }
+
+
 }

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

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power;
 
-import schedframe.resources.CoolEmAllResourceType;
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.profiles.energy.power.ui.PowerInterface;
+import schedframe.resources.devices.PhysicalResource;
+import schedframe.resources.devices.PhysicalResourcePowerInterface;
 
 public class PowerInterfaceFactory {
 
-
-
-        //new1
-        /*public static PowerInterface createPowerProfile(ResourceType resourceType, List<PowerState> powerStates, List<PState> pStates, String eepn){
-
-                PowerInterface powerProfile;
-
-                switch(resourceType){
-                        case DataCenter: powerProfile = new DataCenterPowerInterfaceNew(eepn, powerStates); break;
-                        case ComputingNode: powerProfile = new ComputingNodePowerInterfaceNew(eepn, powerStates); break;
-                        case Processor: powerProfile = new CPUPowerInterfaceNew(eepn, powerStates, pStates); break;
-                        default:
-                                throw new IllegalArgumentException("ResourceType " + resourceType + " is not supported.");
-                }
-
-                return powerProfile;
-        }*/
         
-        public static PowerInterface createPowerInterface(ComputingResource resource, PowerProfile pp){
+        public static PowerInterface createPowerInterface(PhysicalResource resource, PowerProfile pp){
                 if(pp == null)
                         return null;
                 PowerInterface powerInterface;
-
+                
                 if(resource.getType().getName().equals(StandardResourceType.DataCenter.getName()))
-                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.DataCenterPowerInterface(resource, pp);
-                else if (resource.getType().getName().equals(StandardResourceType.ComputingNode.getName()))
-                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingNodePowerInterface(resource, pp);
+                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.DataCenterPowerInterface((ComputingResource)resource, pp);
+                else if (resource.getType().getName().equals(StandardResourceType.Node.getName()))
+                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingNodePowerInterface((ComputingResource)resource, pp);
                 else if (resource.getType().getName().equals(StandardResourceType.Processor.getName()))
-                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ProcessorPowerInterface(resource, pp);
-                else if (resource.getType().getName().equals(CoolEmAllResourceType.Node.getName()))
-                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingNodePowerInterface(resource, pp);
+                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ProcessorPowerInterface((ComputingResource)resource, pp);
+                else if (resource.getType().getName().equals(StandardResourceType.CRAH.getName()))
+                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                else if (resource.getType().getName().equals(StandardResourceType.Fan.getName()))
+                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                else if (resource.getType().getName().equals(StandardResourceType.Inlet.getName()))
+                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                else if (resource.getType().getName().equals(StandardResourceType.Outlet.getName()))
+                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                else if (resource.getType().getName().equals(StandardResourceType.CoolingDevice.getName()))
+                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                else if (resource.getType().getName().equals(StandardResourceType.Heatsink.getName()))
+                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
                 else 
-                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingResourcePowerInterface(resource, pp);
+                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingResourcePowerInterface((ComputingResource)resource, pp);
 
                 /*switch(resource.getType()){

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

@@ -24 +24 @@
         public PowerProfile(EnergyEstimationPlugin energyEstimationPlugin, List<PowerState> powerStates) {
                 this.energyEstimationPlugin = energyEstimationPlugin;
+                this.supportedPowerStates = powerStates;
                 this.powerUsage = new ArrayList<PowerUsage>();
-                this.supportedPowerStates = powerStates;
+                initDefaultPowerStates();
         }
         
-        public PowerProfile(EnergyEstimationPlugin energyEstimationPlugin, List<PowerState> powerStates,  List<PState> pStates) {
+        public PowerProfile(EnergyEstimationPlugin energyEstimationPlugin, List<PowerState> powerStates, List<PState> pStates) {
                 this.energyEstimationPlugin = energyEstimationPlugin;
                 this.supportedPowerStates = powerStates;
@@ -37 +38 @@
                         supportedPStates.put(pState.getName(), pState);
                 }
+                initDefaultPowerStates();
         }
         
@@ -60 +62 @@
         }
         
-        public List<PowerState> getSupportedPowerStates() throws NoSuchFieldException{
+        public List<PowerState> getSupportedPowerStates() {
                 if(supportedPowerStates == null)
-                        throw new NoSuchFieldException("Supported power states are not defined.");
+                        return new ArrayList<PowerState>();
                 return supportedPowerStates;
         }
@@ -111 +113 @@
         }
 
-
+        protected void initDefaultPowerStates(){
+                boolean supportsON = false;
+                boolean supportsOFF = false;
+                if(supportedPowerStates == null){
+                        supportedPowerStates = new ArrayList<PowerState>();
+                }
+                for(PowerState ps: supportedPowerStates){
+                        if(ps.getName().equals(StandardPowerStateName.ON)){
+                                supportsON = true;
+                        } else if (ps.getName().equals(StandardPowerStateName.OFF)){
+                                supportsOFF = true;
+                        }
+                }
+                
+                if(!supportsON){
+                        supportedPowerStates.add(new PowerState(StandardPowerStateName.ON, -1, new ArrayList<Transition>()));
+                }
+                if(!supportsOFF){
+                        supportedPowerStates.add(new PowerState(StandardPowerStateName.OFF, -1, new ArrayList<Transition>()));
+                }
+        }
 }

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

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

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

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power.ui;
 
+
+
+import org.joda.time.DateTime;
+
+import schedframe.SimulatedEnvironment;
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingNode;
@@ -38 +43 @@
                 
                 if(!pePowerStateChangeStatus){
-                        computingNode.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getName()));
+                        computingNode.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getFullName()));
                 }
 
@@ -48 +53 @@
                 }
                 //computingNode.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getName()));
+                //ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "POWER_STATE_CHANGED", state.getName());
                 return true;
         }

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

@@ -4 +4 @@
 import java.util.List;
 
+import org.joda.time.DateTime;
 import org.joda.time.DateTimeUtils;
 
 import schedframe.Parameters;
+import schedframe.SimulatedEnvironment;
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
@@ -46 +48 @@
                         }
                         //notifications from all levels
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getName()));
+                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getFullName()));
 
                         //notification from last level
                         //if (resource.getChildren() == null) resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource));
                         
+                        //ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "POWER_STATE_CHANGED", state.getName());
                         return true;
                 }
@@ -70 +73 @@
 
         public boolean supportPowerState(PowerStateName state) {
-                try {
-                        for(PowerState powerState: powerProfile.getSupportedPowerStates()){
-                                if(powerState.getName().equals(state)){
-                                        return true;
-                                }
+                for(PowerState powerState: powerProfile.getSupportedPowerStates()){
+                        if(powerState.getName().equals(state)){
+                                return true;
                         }
-                } catch (NoSuchFieldException e) {
-                        return false;
                 }
                 return false;

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

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power.ui;
 
+import org.joda.time.DateTime;
+
+import schedframe.SimulatedEnvironment;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.DataCenter;
@@ -23 +26 @@
                         child.getPowerInterface().setPowerState(state);
                 }
-
+                //ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "POWER_STATE_CHANGED", state.getName());
                 return true;
         }

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

@@ -4 +4 @@
 import java.util.Map;
 
+import org.joda.time.DateTime;
+
+import schedframe.SimulatedEnvironment;
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
@@ -16 +19 @@
 
         protected PState currentPState;
-
 
         public ProcessorPowerInterface(ComputingResource resource, PowerProfile pp){
@@ -34 +36 @@
                                 resource.setStatus(ResourceStatus.FREE);
                         }
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getName()));         
+                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getFullName()));             
                 }
 
@@ -68 +70 @@
                         //speed.setAmount(Double.valueOf(currentPState.getFrequency()).intValue());
                         //new ResourceEventCommand(resource).execute(EnergyEventType.FREQUENCY_CHANGED);
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.FREQUENCY_CHANGED, resource.getName()));
+                        resource.handleEvent(new EnergyEvent(EnergyEventType.FREQUENCY_CHANGED, resource.getFullName()));
                         //resource.getScheduler().sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE, resource.getName());
+                        
+                        //ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "PSTATE_CHANGED", pStateName);
                         return true;
                 }