Changeset 512

Timestamp:

10/12/12 13:04:31 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src

Files:

• example/localplugin/FCFSCPUFreqScalingClusterLocalPlugin.java (modified) (6 diffs)
• schedframe/ResourceController.java (modified) (2 diffs)
• schedframe/resources/computing/ComputingResource.java (modified) (4 diffs)
• schedframe/resources/computing/description/ComputingResourceDescription.java (modified) (3 diffs)
• schedframe/resources/computing/profiles/energy/power/PowerProfile.java (modified) (1 diff)
• schedframe/resources/computing/profiles/energy/power/ui/ProcessorPowerInterface.java (modified) (6 diffs)
• simulator/DataCenterWorkloadSimulator.java (modified) (1 diff)
• simulator/reader/ResourceReader.java (modified) (5 diffs)
• simulator/stats/implementation/DCWormsStatistics.java (modified) (2 diffs)

DCWoRMS/trunk/src/example/localplugin/FCFSCPUFreqScalingClusterLocalPlugin.java

@@ -9 +9 @@
 
 import schedframe.events.scheduling.SchedulingEvent;
-import schedframe.events.scheduling.TaskFinishedEvent;
-import schedframe.events.scheduling.TaskRequestedTimeExpiredEvent;
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.computing.ComputingResource;
@@ -18 +16 @@
 import schedframe.resources.units.ResourceUnitName;
 import schedframe.resources.units.StandardResourceUnitName;
-import schedframe.scheduling.UsedResourcesList;
 import schedframe.scheduling.manager.resources.ClusterResourceManager;
 import schedframe.scheduling.manager.resources.ResourceManager;
@@ -29 +26 @@
 import schedframe.scheduling.tasks.TaskInterface;
 import schedframe.scheduling.tasks.WorkloadUnit;
-import dcworms.schedframe.scheduling.Executable;
 
 public class FCFSCPUFreqScalingClusterLocalPlugin extends BaseLocalSchedulingPlugin {
@@ -51 +47 @@
                 
                 case START_TASK_EXECUTION:
-
+                case TASK_FINISHED:
                         // check all tasks in queue
                         for (int i = 0; i < q.size(); i++) {
@@ -62 +58 @@
                                         if (choosenResources  != null) {
                                                 addToSchedulingPlan(plan, task, choosenResources);
-                                                ProcessingElements pes = (ProcessingElements)choosenResources.get(StandardResourceUnitName.PE);
-                                                List<Processor> processors =  new ArrayList<Processor>();
-                                                for(ComputingResource res : pes){
-                                                        processors.add((Processor) res);
-                                                }
-                                                adjustFrequency(ResourceStatus.BUSY,processors);
                                         } 
                                 }
                         }
-                        break;
-                        
-                case TASK_FINISHED:
-                        TaskFinishedEvent finEvent = (TaskFinishedEvent) event;
-                        Executable exec = (Executable) jobRegistry.getExecutable(finEvent.getJobId(), finEvent.getTaskId());
-                        UsedResourcesList usedResourcesList = exec.getUsedResources();
-                        ProcessingElements pes = (ProcessingElements)usedResourcesList.getLast().getResourceUnits().get(StandardResourceUnitName.PE);
-                        List<Processor> processors =  new ArrayList<Processor>();
-                        for(ComputingResource res : pes){
-                                processors.add((Processor) res);
-                                allocatedCPUs.add((Processor) res);
-                        }
-                        adjustFrequency(ResourceStatus.FREE, processors);
-                        break;
-                        
-                case TASK_REQUESTED_TIME_EXPIRED:
-                        TaskRequestedTimeExpiredEvent timExpEvent = (TaskRequestedTimeExpiredEvent) event;
-                        exec = (Executable) jobRegistry.getExecutable(timExpEvent.getJobId(), timExpEvent.getTaskId());
-                        usedResourcesList = exec.getUsedResources();
-                        pes = (ProcessingElements)usedResourcesList.getLast().getResourceUnits().get(StandardResourceUnitName.PE);
-                        processors =  new ArrayList<Processor>();
-                        for(ComputingResource res : pes){
-                                allocatedCPUs.remove((Processor) res);
-                        }
-                        // check all tasks in queue
-                        for (int i = 0; i < q.size(); i++) {
-                                WorkloadUnit job = q.get(i);
-                                TaskInterface<?> task = (TaskInterface<?>) job;
-                                // if status of the tasks in READY
-                                if (task.getStatus() == DCWormsTags.READY) {
-
-                                        Map<ResourceUnitName, ResourceUnit> choosenResources = chooseResourcesForExecution(resourceManager, task);
-                                        if (choosenResources  != null) {
-                                                addToSchedulingPlan(plan, task, choosenResources);
-                                                pes = (ProcessingElements)choosenResources.get(StandardResourceUnitName.PE);
-                                                processors =  new ArrayList<Processor>();
-                                                for(ComputingResource res : pes){
-                                                        processors.add((Processor) res);
-                                                }
-                                                adjustFrequency(ResourceStatus.BUSY, processors);
-                                        } 
-                                }
-                        }
-                        break;
+                        adjustFrequency(resourceManager.getProcessors());
                 }
                 return plan;
@@ -160 +107 @@
                 return map;
         }
+        
+        private void adjustFrequency(List<Processor> processors){
 
-        private void adjustFrequency(ResourceStatus status, List<Processor> processors){
-                switch(status){
-                case BUSY:
-                        for(Processor cpu: processors){
-                                try {
-                                        if(cpu.getPowerInterface().getSupportedPStates().containsKey("P0"))
-                                                cpu.getPowerInterface().setPState("P0");
-                                } catch (NoSuchFieldException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
-                                }
+                for(Processor cpu: processors){
+                        if(cpu.getStatus() == ResourceStatus.FREE) {
+                                if(cpu.getPowerInterface().getSupportedPStates().containsKey("P3"))
+                                        cpu.getPowerInterface().setPState("P3");
                         }
-                        break;
-                case FREE:
-                        for(Processor cpu: processors){
-                                try {
-                                        if(cpu.getPowerInterface().getSupportedPStates().containsKey("P3"))
-                                                cpu.getPowerInterface().setPState("P3");
-                                } catch (NoSuchFieldException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
-                                }
+                        else{
+                                if(cpu.getPowerInterface().getSupportedPStates().containsKey("P0"))
+                                        cpu.getPowerInterface().setPState("P0");
                         }
-                        break;
+
                 }
+
         }
 
+
 }

DCWoRMS/trunk/src/schedframe/ResourceController.java

@@ -18 +18 @@
         protected static Scheduler scheduler;
         protected static List<ComputingResource> computingResources;
-        protected Deque<Initializable> toInit;
+        protected List<Initializable> toInit;
         protected Set<String> compResLayers;
         
@@ -137 +137 @@
         }
 
-        public void setInitList(Deque<Initializable> toI) {
+        public void setInitList(List<Initializable> toI) {
                 toInit = toI;
         }
 
-        public Deque<Initializable> getToInit() {
+        public List<Initializable> getToInit() {
                 return toInit;
         }

DCWoRMS/trunk/src/schedframe/resources/computing/ComputingResource.java

@@ -46 +46 @@
         protected String name;
         protected ResourceType type;
+        protected String category;
         protected ResourceStatus status;
 
@@ -63 +64 @@
                 this.type = resDesc.getType();
                 this.name = resDesc.getId();
+                this.category = resDesc.getCategory();
                 this.status = ResourceStatus.FREE;
                 this.extensionList = new ExtensionListImpl(1);
@@ -230 +232 @@
         }
         
+        public String getCategory(){
+                return category;
+        }
+        
         public PowerInterface getPowerInterface(){
                 if (extensionList != null) {
@@ -297 +303 @@
         public void initiate(){
                 
-                ResourceEventCommand rec = new ResourceEventCommand(this);
+                /*ResourceEventCommand rec = new ResourceEventCommand(this);
                 EnergyEvent event = new EnergyEvent(EnergyEventType.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");
+                rec.execute(event);*/
+                ResourceEventCommand rec = new ResourceEventCommand(this);
+                EnergyEvent event = new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
                 rec.execute(event);

DCWoRMS/trunk/src/schedframe/resources/computing/description/ComputingResourceDescription.java

@@ -33 +33 @@
         protected AirThroughputProfile airThroughputProfile;
         protected Location location;
+        protected String category;
         //protected Parameters parameters;
 
@@ -40 +41 @@
 
                 initId(computingResource);
+                this.category = computingResource.getType();
 
                 if (computingResource.getComputingResourceTypeChoiceSequence() != null) {
@@ -263 +265 @@
         }
 
-
+        public String getCategory() {
+                return category;
+        }
 
 }

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

@@ -66 +66 @@
         }
         
-        public Map<String, PState> getSupportedPStates() throws NoSuchFieldException {
+        public Map<String, PState> getSupportedPStates() {
                 if(supportedPStates == null)
-                        throw new NoSuchFieldException("Supported p-states are not defined.");
+                        return new HashMap<String, PState>();
                 return supportedPStates;
         }

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

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power.ui;
 
-
-import gridsim.GridSimTags;
-import gridsim.dcworms.DCWormsTags;
 
 import java.util.Map;
@@ -15 +12 @@
 import schedframe.resources.computing.profiles.energy.power.PowerStateName;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
-import schedframe.resources.units.CpuSpeed;
-import schedframe.resources.units.StandardResourceUnitName;
 
 public class ProcessorPowerInterface extends ComputingResourcePowerInterface {
@@ -26 +21 @@
                 super(resource, pp);
                 currentPowerState = StandardPowerStateName.ON;
-                try {
-                        currentPState = getSupportedPStates().get("P0");
-                } catch (NoSuchFieldException e) {
-                        currentPState = null;
-                }
+                currentPState = getSupportedPStates().get("P0");
         }
         
@@ -53 +44 @@
         }
         
-        public Map<String, PState> getSupportedPStates() throws NoSuchFieldException {
+        public Map<String, PState> getSupportedPStates() {
                 return powerProfile.getSupportedPStates();
         }
         
         public boolean supportPState(PState pState) {
-                try {
-                        for(String pStateName: getSupportedPStates().keySet()){
-                                if(pState.getName().equals(pStateName)){
-                                        return true;
-                                }
+
+                for(String pStateName: getSupportedPStates().keySet()){
+                        if(pState.getName().equals(pStateName)){
+                                return true;
                         }
-                } catch (NoSuchFieldException e) {
-                        return false;
                 }
                 return false;
@@ -71 +59 @@
         
         public boolean setPState(String pStateName){
-                PState newPState;
-                try {
-                        newPState = getSupportedPStates().get(pStateName);
-                } catch (NoSuchFieldException e) {
-                        return false;
-                }
+                PState newPState = getSupportedPStates().get(pStateName);
 
-                if(newPState != currentPState){
+
+                if(newPState != null && newPState != currentPState){
                         //double factor = newPState.getFrequency()/currentPState.getFrequency();
                         currentPState = newPState;
@@ -97 +81 @@
 
         public boolean setFrequency(double freq) {
-                try {
-                        for(String pStateName: getSupportedPStates().keySet()){
-                                if(getSupportedPStates().get(pStateName).getFrequency() == freq){
-                                        setPState(pStateName);
-                                        return true;
-                                }
+
+                for(String pStateName: getSupportedPStates().keySet()){
+                        if(getSupportedPStates().get(pStateName).getFrequency() == freq){
+                                setPState(pStateName);
+                                return true;
                         }
-                } catch (NoSuchFieldException e) {
-                        return false;
                 }
                 return false;

DCWoRMS/trunk/src/simulator/DataCenterWorkloadSimulator.java

@@ -262 +262 @@
                 ResourceController rc = resourceReader.read();
 
-                while(!rc.getToInit().isEmpty()){
-                        Initializable initObj = rc.getToInit().pop();
+                for(Initializable initObj: rc.getToInit()){
                         initObj.initiate();
                 }

DCWoRMS/trunk/src/simulator/reader/ResourceReader.java

@@ -9 +9 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Deque;
 import java.util.HashMap;
@@ -27 +29 @@
 import schedframe.ResourceController;
 import schedframe.exceptions.ResourceException;
+import schedframe.resources.Resource;
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
@@ -51 +54 @@
 
         protected ResourceCalendar resourceCalendar;
-        protected Deque<Initializable> toInit = new ArrayDeque<Initializable>();
+        protected List<Initializable> toInit = new ArrayList<Initializable>();
         
         private ExecutionTimeEstimationPlugin execTimeEstimationPlugin;
@@ -85 +88 @@
 
                 ResourceController rc = new ResourceController(mainScheduler, computingResources);
+                Collections.sort(toInit, new ResourceTypeComparator(new ArrayList<String>(compResLayers)));
                 rc.setInitList(toInit);
                 rc.setCompResLayers(compResLayers);
@@ -430 +434 @@
         }
         
+        class ResourceTypeComparator implements Comparator<Initializable>{
+                
+                List<String> order;
+                ResourceTypeComparator(List<String> order) {
+                        this.order = order;
+                }
+                public int compare(Initializable init1, Initializable init2) {
+                        String type1 = ((Resource)init1).getType().getName();
+                        String type2 = ((Resource)init2).getType().getName();
+                        if(order.indexOf(type1) > order.indexOf(type2))
+                                return -1;
+                        else if (order.indexOf(type1) < order.indexOf(type2))
+                                return 1;
+                        else return 0;
+                        
+                }
+        }
+        
 }

DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -331 +331 @@
                                                 energyUsage.setSumValue(energyUsage.getMeanValue() * (endSimulationTime - startSimulationTime) / (3600 * MILLI_SEC));
                                                 
-                                                EnergyExtension een = (EnergyExtension )(resource.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
+                                                EnergyExtension een = (EnergyExtension)(resource.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
                                                 if(resourceController.getComputingResources().contains(resource)) {
                                                         if( een != null /*&& een.getPp() != null*/ ){
@@ -339 +339 @@
                                                 } else if( een != null && een.getPowerProfile() != null ){
                                                         ComputingResource parent = resource.getParent();
-                                                        een = (EnergyExtension )(parent.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
+                                                        een = (EnergyExtension)(parent.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
                                                         boolean top = true;
                                                         while(parent != null){