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

Timestamp:

06/26/14 14:18:01 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy

Files:

• AbstractManagementSystem.java (modified) (1 diff)
• global/GridBroker.java (modified) (1 diff)
• local/LocalManagementSystem.java (modified) (12 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/AbstractManagementSystem.java

@@ -23 +23 @@
 import schedframe.scheduling.plan.AllocationInterface;
 import schedframe.scheduling.plan.SchedulingPlanInterface;
+import schedframe.scheduling.plugin.ModuleList;
 import schedframe.scheduling.plugin.SchedulingPlugin;
 import schedframe.scheduling.plugin.estimation.ExecutionTimeEstimationPlugin;
-import schedframe.scheduling.plugin.grid.ModuleList;
 import schedframe.scheduling.manager.resources.ResourceAllocation;
 import schedframe.scheduling.queue.TaskQueue;

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/global/GridBroker.java

@@ -12 +12 @@
 import schedframe.scheduling.Scheduler;
 import schedframe.scheduling.manager.resources.ManagedResources;
+import schedframe.scheduling.plugin.ModuleListImpl;
 import schedframe.scheduling.plugin.SchedulingPlugin;
 import schedframe.scheduling.plugin.estimation.ExecutionTimeEstimationPlugin;
-import schedframe.scheduling.plugin.grid.ModuleListImpl;
 import schedframe.scheduling.queue.TaskQueueList;
 

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

@@ -4 +4 @@
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.commons.logging.Log;
@@ -33 +31 @@
 import schedframe.resources.units.StandardResourceUnitName;
 import schedframe.scheduling.ExecutionHistoryItem;
-import schedframe.scheduling.ResourceHistoryItem;
+import schedframe.scheduling.ResourceItem;
 import schedframe.scheduling.Scheduler;
 import schedframe.scheduling.TaskList;
@@ -44 +42 @@
 import schedframe.scheduling.plan.ScheduledTaskInterface;
 import schedframe.scheduling.plan.SchedulingPlanInterface;
+import schedframe.scheduling.plugin.ModuleListImpl;
 import schedframe.scheduling.plugin.SchedulingPlugin;
 import schedframe.scheduling.plugin.estimation.ExecutionTimeEstimationPlugin;
-import schedframe.scheduling.plugin.grid.ModuleListImpl;
 import schedframe.scheduling.policy.AbstractManagementSystem;
 import schedframe.scheduling.queue.TaskQueueList;
@@ -56 +54 @@
 import schedframe.scheduling.tasks.WorkloadUnit;
 import simulator.DCWormsConstants;
-import simulator.stats.GSSAccumulator;
+import simulator.stats.DCwormsAccumulator;
 import simulator.utils.DoubleMath;
 import dcworms.schedframe.scheduling.ExecTask;
@@ -382 +380 @@
 
                 saveExecutionHistory(exec, exec.getCompletionPercentage(), phaseDuration);
-                if(exec.getResourceConsumptionProfile().isLast()){
+                if(exec.getExecutionProfile().isLast()){
                         scheduler.sendInternal(phaseDuration, DCWormsTags.TASK_EXECUTION_FINISHED, execTask);;
                 } else {
@@ -451 +449 @@
                         ExecTask task = iter.next();
                         Executable exec = (Executable)task;
-                        ExecutionHistoryItem execHistItem = exec.getExecHistory().getLast();
+                        ExecutionHistoryItem execHistItem = exec.getExecutionHistory().getLast();
                         //System.out.println("--- upadteProgressX: " + Sim_system.sim_clock() );
                         //System.out.println("taskId: " + exec.getId() + "; completion percentage: " + exec.getCompletionPercentage() + "; timespan: " + timeSpan + "; estimatedDuration: " +  execHistItem.getCompletionPercentage());
@@ -496 +494 @@
                                         execTask, choosenResources, exec.getCompletionPercentage())).intValue();
 
-                        ExecutionHistoryItem execHistItem = exec.getExecHistory().getLast();
+                        ExecutionHistoryItem execHistItem = exec.getExecutionHistory().getLast();
                         double lastTimeStamp = execHistItem.getTimeStamp().getMillis()/1000;
                         if(DoubleMath.subtract((lastTimeStamp + execHistItem.getEstimatedDuration()), (new DateTime().getMillis()/1000 + phaseDuration)) == 0.0){
@@ -508 +506 @@
                         saveExecutionHistory(exec, exec.getCompletionPercentage(), phaseDuration);
                         
-                        if(exec.getResourceConsumptionProfile().isLast()){
+                        if(exec.getExecutionProfile().isLast()){
                                 ExecTaskFilter filter = new ExecTaskFilter(exec.getUniqueId(), DCWormsTags.TASK_EXECUTION_FINISHED);
                                 scheduler.sim_cancel(filter, null);
@@ -542 +540 @@
                         saveExecutionHistory(exec, exec.getCompletionPercentage(), phaseDuration);
                         
-                        if(exec.getResourceConsumptionProfile().isLast()){
+                        if(exec.getExecutionProfile().isLast()){
                                 scheduler.sendInternal(phaseDuration, DCWormsTags.TASK_EXECUTION_FINISHED, execTask);
                         } else {
@@ -555 +553 @@
         public double calculateTotalLoad() {
 
-                GSSAccumulator loadAcc = new GSSAccumulator();
+                DCwormsAccumulator loadAcc = new DCwormsAccumulator();
                 try {
                         for(ComputingResource compRes: getResourceManager().getResourcesOfType(StandardResourceType.Node)){
@@ -718 +716 @@
                 boolean allocationStatus = getAllocationManager().allocateResources(choosenResources, exclusive);
                 if(allocationStatus){
-                        ResourceHistoryItem resourceHistoryItem = new ResourceHistoryItem(choosenResources);
+                        ResourceItem resourceHistoryItem = new ResourceItem(choosenResources);
                         exec.addAllocatedResources(resourceHistoryItem);
-                        saveResourceHistory(exec);
                         return true;
                 }
@@ -726 +723 @@
         }
         
-        private void saveResourceHistory(Executable exec){
-                ProcessingElements pes = (ProcessingElements) exec.getAllocatedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
-                for (ComputingResource resource : pes) {
-
-                        LinkedList<ComputingResource> toExamine = new LinkedList<ComputingResource>();
-                        toExamine.push(resource);
-
-                        while (!toExamine.isEmpty()) {
-                                ComputingResource compResource = toExamine.pop();
-                                List<ComputingResource> resources = compResource.getChildren();
-                                if(resources.isEmpty()){
-                                        Set<String> visitedResources = exec.getAllocatedResources().getLast().getVisitedResources();
-                                        if(!visitedResources.contains(compResource.getFullName())){
-                                                exec.getAllocatedResources().getLast().trackResource(compResource.getFullName());
-                                        }
-                                } else {
-                                        for (int i = 0; i < resources.size(); i++) {
-                                                ComputingResource resourceChild = resources.get(i);
-                                                toExamine.addLast(resourceChild);
-                                        }
-                                }
-                        }
-                }
-        }
+
         
 }