Changeset 497 for DCWoRMS/trunk/src/schedframe/scheduling/policy/local

Timestamp:

10/11/12 09:07:11 (13 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (7 diffs)

DCWoRMS/trunk/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -6 +6 @@
 import eduni.simjava.Sim_system;
 import gridsim.Accumulator;
+import gridsim.GridSimTags;
 import gridsim.ResourceCalendar;
 import gridsim.dcworms.DCWormsTags;
@@ -115 +116 @@
 
                 case DCWormsTags.TASK_READY_FOR_EXECUTION:
-                        
                         ExecTask execTask = (ExecTask) ev.get_data();
                         try {
@@ -347 +347 @@
                         ExecTask task = iter.next();
                         Executable exec = (Executable)task;
+                        exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * timeSpan/exec.getEstimatedDuration());
+                        
                         UsedResourcesList usedResourcesList = exec.getUsedResources();
                         PEUnit peUnit = (PEUnit)usedResourcesList.getLast().getResourceUnits()
                                         .get(StandardResourceUnitName.PE);
-
                         double load = getMIShare(timeSpan, peUnit);
-                        exec.setCompletionPercentage(100 * timeSpan/exec.getEstimatedDuration());
                         addTotalLoad(load);
                 }
@@ -401 +401 @@
                         
                         Map<ResourceUnitName, ResourceUnit> choosenResources = exec.getUsedResources().getLast().getResourceUnits();
-                        double time = execTimeEstimationPlugin.execTimeEstimation(new SchedulingEvent(SchedulingEventType.RESOURCE_STATE_CHANGED), 
-                                        execTask, choosenResources, exec.getCompletionPercentage());
+                        int time =  Double.valueOf(execTimeEstimationPlugin.execTimeEstimation(new SchedulingEvent(SchedulingEventType.RESOURCE_STATE_CHANGED), 
+                                        execTask, choosenResources, exec.getCompletionPercentage())).intValue();
 
                         //check if the new estimated end time is equal to the previous one; if yes the continue without update
@@ -408 +408 @@
                                 continue;
                         }
+                        exec.setEstimatedDuration(time);
                         ExecTaskFilter filter = new ExecTaskFilter(exec.getUniqueId(), DCWormsTags.TASK_EXECUTION_FINISHED);
                         scheduler.sim_cancel(filter, null);
@@ -449 +450 @@
 
                 Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
-                ResourceManager resourceManager = this.resourceManager;
+                LocalResourceManager resourceManager = getResourceManager();
                 if(resourceName != null){
                         ComputingResource resource = null;
@@ -471 +472 @@
                         List<ResourceUnit> availableUnits = null;
                         try {
-                                availableUnits = getResourceManager().getPE();
+                                availableUnits = resourceManager.getPE();
                         } catch (ResourceException e) {
                                 return null;