Changeset 1299 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing

Timestamp:

03/19/14 18:22:27 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• ComputingResource.java (modified) (9 diffs)
• coolemall/NodeGroup.java (modified) (4 diffs)
• profiles/energy/power/ui/ProcessorPowerInterface.java (modified) (1 diff)

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

@@ -3 +3 @@
 import gridsim.GridSimTags;
 import gridsim.dcworms.DCWormsTags;
+import gridsim.dcworms.filter.ResourceEventFilter;
 
 import java.util.ArrayList;
@@ -24 +25 @@
 import schedframe.resources.computing.profiles.energy.EnergyEventType;
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
+import schedframe.resources.computing.profiles.load.LoadExtension;
+import schedframe.resources.computing.profiles.load.ResourceLoadCalendar;
+import schedframe.resources.computing.profiles.load.TimestampUtilization;
+import schedframe.resources.computing.profiles.load.ui.LoadInterface;
 import schedframe.resources.computing.properties.DefaultPropertiesBuilder;
 import schedframe.resources.computing.properties.PropertiesDirector;
@@ -34 +39 @@
 import schedframe.resources.devices.PhysicalResource;
 import schedframe.scheduling.Scheduler;
+import simulator.DataCenterWorkloadSimulator;
 
 public class ComputingResource extends PhysicalResource{
@@ -51 +57 @@
                 this.extensionList = new ExtensionListImpl(1);
                 initCharacteristics(resDesc);
+                accept(new LoadExtension(resDesc.getLoadProfile(), this));
                 accept(new EnergyExtension.Builder().resource(this).powerProfile(resDesc.getPowerProfile()).airFlowProfile(resDesc.getAirThroughputProfile()).thermalProfile(resDesc.getThermalProfile()).build());     
         }
@@ -67 +74 @@
         public void setParent(ComputingResource newParent) {
                 parent = newParent;
+                if(this.getLoadInterface().getLoadCalendar().getLoadDistribution().size() == 0){
+                        this.getLoadInterface().getLoadCalendar().getLoadDistribution().addAll(parent.getLoadInterface().getLoadCalendar().getLoadDistribution());
+                }
         }
 
@@ -220 +230 @@
                 public void handleResourceEvent(Event event){
                         if (extensionList != null) {
-                                for (Extension extension : extensionList) {
+                                for (Extension extension: extensionList) {
                                         if (extension.supportsEvent(event)) {
                                                 extension.handleEvent(event);
@@ -227 +237 @@
                                 
                                 for (Device device: ((ComputingResourceCharacteristics)resourceCharacteristic).getDevices()) {
-                                        for (Extension extension : device.getExtensionList()) {
+                                        for (Extension extension: device.getExtensionList()) {
                                                 if (extension.supportsEvent(event)) {
-                                                        //extension.handleEvent(event);
+                                                        extension.handleEvent(event);
                                                 }
                                         }
@@ -242 +252 @@
                         if(scheduler != null && (parent != null && scheduler != parent.getScheduler())/*scheduler.getResources().contains(this)*/){
                                 String src = event.getSource() != null ? event.getSource() : name;
+                                ResourceEventFilter filter = new ResourceEventFilter(src.hashCode(), DCWormsTags.UPDATE_PROCESSING);
+                                scheduler.sim_cancel(filter, null);
                                 scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
                         } else if(parent != null)
@@ -274 +286 @@
                 rec.execute(event);
                 
+                LoadInterface li = getLoadInterface();
+                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()));
+                        }                                       
+                }
                 //alternative way
                 //getEventHandler().handleResourceEvent(new EnergyEvent(EnergyEventType.AIRFLOW_STATE_CHANGED, "Resource controller"));

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

@@ -1 +1 @@
 package schedframe.resources.computing.coolemall;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -8 +9 @@
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.description.ComputingResourceDescription;
+import schedframe.resources.computing.description.ResourceDescription;
+import schedframe.resources.devices.Device;
+import schedframe.resources.devices.Fan;
+import test.Node_Fan_Mapping;
 
 public class NodeGroup extends ComputingResource{
@@ -13 +18 @@
         public NodeGroup(ComputingResourceDescription resDesc) {
                 super(resDesc);
+                initNodes_FansMapping(resDesc);
         }
 
@@ -25 +31 @@
         }
 
+        
+        private void initNodes_FansMapping(ComputingResourceDescription resDesc){
+                Node_Fan_Mapping.init();
+                for(Device dev: this.getResourceCharacteristic().getDevices()){
+                        if(dev.getType().equals(StandardResourceType.Fan) || dev.getType().equals(StandardResourceType.Inlet) | dev.getType().equals(StandardResourceType.Outlet)){
+                                Fan fan = (Fan) dev;
+                                List<String> chilledResources = new ArrayList<String>();
+                                for(ResourceDescription nodeDesc: resDesc.getChildren()){
+                                        String nodeName = this.getFullName() + "/" + nodeDesc.getId();
+                                        if(!Node_Fan_Mapping.getNode_fan().containsKey(nodeName)){
+                                                chilledResources.add(nodeName);
+                                        } else if(Node_Fan_Mapping.getNode_fan().get(nodeName).equals(fan.getFullName())){
+                                                chilledResources.add(nodeName);
+                                        } else {
+                                                //if mapping present but there is no match do nothing
+                                        }
+                                }
+                                fan.setChilledResources(chilledResources);
+                        }
+                }
+        }
 }

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

@@ -20 +20 @@
                 super(resource, pp);
                 currentPowerState = StandardPowerStateName.ON;
-                currentPState = getHighestPState();
+                currentPState = getLowestPState();
         }