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

Timestamp:

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

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (10 diffs)

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);