Changeset 1423 for DCWoRMS/branches/coolemall/src/schedframe/scheduling

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling

Files:

• ExecutionHistoryItem.java (modified) (2 diffs)
• ResourceItem.java (modified) (4 diffs)
• policy/local/LocalManagementSystem.java (modified) (10 diffs)
• tasks/phases/ExecutionProfile.java (modified) (4 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/ExecutionHistoryItem.java

@@ -5 +5 @@
 public class ExecutionHistoryItem {
 
-        protected DateTime timeStamp;
+        protected long timeStamp;
         protected double completionPercentage;
         protected double estimatedDuration;
@@ -11 +11 @@
         protected int resUsageIndex;
 
-        public ExecutionHistoryItem(DateTime time){
+        public ExecutionHistoryItem(long time){
                 this.timeStamp = time;
         }
 
-        public DateTime getTimeStamp(){
+        public long getTimeStamp(){
                 return timeStamp;
         }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/ResourceItem.java

@@ -1 +1 @@
 package schedframe.scheduling;
 
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 
 import schedframe.resources.computing.ComputingResource;
@@ -20 +20 @@
         public ResourceItem(Map<ResourceUnitName, ResourceUnit> usedResources){
                 this.usedResources = usedResources;
-                this.resourceNames = new TreeSet<String>();
-                saveResourceNames();
+                this.resourceNames = saveResourceNames();
         }
         
@@ -32 +31 @@
         }
         
-        private void saveResourceNames(){
+        private Set<String> saveResourceNames(){
+                Set<String> resourceNames;
                 ProcessingElements pes = (ProcessingElements) usedResources.get(StandardResourceUnitName.PE);
-                for (ComputingResource resource : pes) {
+                resourceNames = new HashSet<String>(pes.size(), 1);
+                for (ComputingResource resource: pes) {
 
                         LinkedList<ComputingResource> toExamine = new LinkedList<ComputingResource>();
@@ -54 +55 @@
                         }
                 }
+                return resourceNames;
         }
 }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -4 +4 @@
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
@@ -93 +95 @@
 
                 int tag = ev.get_tag();
-
                 switch (tag) {
 
@@ -139 +140 @@
                                 getWorkloadUnitHandler().handleJob(job);
                         } 
-                        //SUPPORTS PRECEDING CONSTRAINST COMING BOTH FROM SWF FILES
+                        //SUPPORTS PRECEDING CONSTRAINST COMING ALSO FROM SWF FILES
                         /*else {
                                 try {
@@ -394 +395 @@
                 PEUnit peUnit = (PEUnit)resources.get(StandardResourceUnitName.PE);
                 updateComputingResources(peUnit, ResourceEventType.TASK_STARTED, exec);
-                
-        }
+        }
+
         protected void finalizeExecutable(ExecTask execTask){
                 
@@ -459 +460 @@
                         //System.out.println("taskId: " + exec.getId() + "; completion percentage: " + exec.getCompletionPercentage() + "; timespan: " + timeSpan + "; estimatedDuration: " +  execHistItem.getCompletionPercentage());
                         exec.getExecutionProfile().setCompletionPercentage(exec.getExecutionProfile().getCompletionPercentage() + 100 * (timeSpan / (execHistItem.getEstimatedDuration()) * (1.0 - execHistItem.getCompletionPercentage()/100.0)));
-                        exec.setTotalCompletionPercentage(exec.getTotalCompletionPercentage() + 100 * (timeSpan / execHistItem.getEstimatedDuration()) * exec.getExecutionProfile().getCurrentResourceConsumption().getLenght() / exec.getExecutionProfile().getLength());
+                        exec.setTotalCompletionPercentage(exec.getTotalCompletionPercentage() + 100 * (timeSpan / execHistItem.getEstimatedDuration()) * exec.getExecutionProfile().getCurrentExecutionPhase().getLenght() / exec.getExecutionProfile().getLength());
                         //System.out.println("newProgress: " + exec.getCompletionPercentage()  );       
 
@@ -467 +468 @@
         private void updateComputingResources(PEUnit peUnit, ResourceEventType eventType, Object obj){
                 if(peUnit instanceof ProcessingElements){
-                        ProcessingElements pes = (ProcessingElements) peUnit;
+                        /*ProcessingElements pes = (ProcessingElements) peUnit;
                         for (ComputingResource resource : pes) {
                                 resource.handleEvent(new ResourceEvent(eventType, obj, scheduler.getFullName()));
                                 //DataCenterWorkloadSimulator.getEventManager().sendToResources(resource.getType(), 0, new EnergyEvent(eventType, obj));
-                        }
+                        }*/
                         /*try {
                                 for (ComputingResource resource : resourceManager.getResourcesOfType(pes.get(0).getType())) {
@@ -480 +481 @@
                                 e.printStackTrace();
                         }*/
+                        
+                        ProcessingElements pes = (ProcessingElements) peUnit;
+                        ResourceEvent resEvent = new ResourceEvent(eventType, obj, scheduler.getFullName());            
+                        try{
+                                Set<ComputingResource> resourcesToUpdate = new LinkedHashSet<ComputingResource>();
+                        
+                                for (ComputingResource compResource : pes) {
+                                        resourcesToUpdate.add(compResource);
+                                }
+                                while(resourcesToUpdate.size() > 0){
+                                        Set<ComputingResource> newSet = new LinkedHashSet<ComputingResource>();
+                                        for(ComputingResource compResource: resourcesToUpdate){
+                                                compResource.updateState(resEvent);
+                                                if(compResource.getParent() != null){
+                                                        newSet.add(compResource.getParent());
+                                                }
+                                        }
+                                        resourcesToUpdate = new LinkedHashSet<ComputingResource>(newSet);
+                                }
+                        }catch(Exception e){
+                        }
                 } else {
                         ComputingResource resource = null;
@@ -492 +514 @@
 
         protected void updateProcessingTimes() {
-                for (ExecTask execTask : jobRegistry.getRunningTasks()) {
+                for (ExecTask execTask: jobRegistry.getRunningTasks()) {
                         Executable exec = (Executable)execTask;
 
@@ -502 +524 @@
 
                         ExecutionHistoryItem execHistItem = exec.getExecutionHistory().getLast();
-                        double lastTimeStamp = execHistItem.getTimeStamp().getMillis() / 1000;
+                        double lastTimeStamp = execHistItem.getTimeStamp() / 1000;
                         if(DoubleMath.subtract((lastTimeStamp + execHistItem.getEstimatedDuration()), (new DateTime().getMillis() / 1000 + phaseDuration)) == 0.0){
                                 continue;
@@ -706 +728 @@
         
         private void saveExecutionHistory(Executable exec, double completionPercentage, double estimatedDuration){
-                ExecutionHistoryItem execHistoryItem = new ExecutionHistoryItem(new DateTime());
+                ExecutionHistoryItem execHistoryItem = new ExecutionHistoryItem(new DateTime().getMillis());
                 execHistoryItem.setCompletionPercentage(completionPercentage);
                 execHistoryItem.setEstimatedDuration(estimatedDuration);

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/ExecutionProfile.java

@@ -5 +5 @@
 public class ExecutionProfile {
         
-        protected LinkedList<ExecutionPhase> resourceConsumptionList;
+        protected LinkedList<ExecutionPhase> executionPhases;
         protected long usefulWork;
         protected double completionPercentage;
@@ -11 +11 @@
         
 
-        public ExecutionProfile(LinkedList<ExecutionPhase> resourceConsumptionList) {
-                this.resourceConsumptionList = resourceConsumptionList;
+        public ExecutionProfile(LinkedList<ExecutionPhase> execPhases) {
+                this.executionPhases = execPhases;
                 this.completionPercentage = 0;
                 this.currentPhase = 0;
         }
         
-        public LinkedList<ExecutionPhase> getResourceConsumptionList(){
-                return resourceConsumptionList;
+        public LinkedList<ExecutionPhase> getExecutionPhases(){
+                return executionPhases;
         }
         
-        public ExecutionPhase getCurrentResourceConsumption(){
-                return resourceConsumptionList.get(currentPhase);
+        public ExecutionPhase getCurrentExecutionPhase(){
+                return executionPhases.get(currentPhase);
         }
 
@@ -42 +42 @@
         
         public boolean isLast(){
-                if(currentPhase == resourceConsumptionList.size() - 1){
+                if(currentPhase == executionPhases.size() - 1){
                         return true;
                 }
@@ -58 +58 @@
         public long getLength() {
                 long length = 0;
-                for(ExecutionPhase execPhase: resourceConsumptionList){
+                for(ExecutionPhase execPhase: executionPhases){
                         length = length + execPhase.getLenght();
                 }