Changeset 142 for xssim/trunk

Timestamp:

03/15/12 16:05:10 (13 years ago)

Author:

wojtekp

Message:

 

File:

• xssim/trunk/src/test/rewolucja/scheduling/implementation/LocalManagementSystem.java (modified) (4 diffs)

xssim/trunk/src/test/rewolucja/scheduling/implementation/LocalManagementSystem.java

@@ -4 +4 @@
 import eduni.simjava.Sim_system;
 import gridsim.Accumulator;
-import gridsim.GridSim;
 import gridsim.GridSimTags;
 import gridsim.Gridlet;
@@ -37 +36 @@
 import schedframe.scheduling.events.TaskCanceledEvent;
 import schedframe.scheduling.events.TaskFinishedEvent;
+import schedframe.scheduling.events.TaskRequestedTimeExpiredEvent;
 import schedframe.scheduling.plugin.SchedulingPluginConfiguration;
 import schedframe.scheduling.plugin.estimation.ExecTimeEstimationPlugin;
@@ -161 +161 @@
                 case GssimTags.TASK_REQUESTED_TIME_EXPIRED:
                         obj = ev.get_data();
-
+                        task = (SubmittedTask) obj;
                         if (pluginSupportsEvent(tag)) {
-                                SchedulingEvent event = new SchedulingEvent(SchedulingEventType.TASK_REQUESTED_TIME_EXPIRED);
+                                SchedulingEvent event = new TaskRequestedTimeExpiredEvent(task.getJobId(), task.getId());
                                 SchedulingPlanInterfaceNew decision = schedulingPlugin.schedule(event,
                                                 queues, getJobRegistry(), getResourceManager(), moduleList);
@@ -394 +394 @@
                         if(!subTask.getVisitedResources().contains(ev.get_data().toString())) {
                                 continue;
-                        } else if( DoubleMath.subtract(subTask.getEstimatedDuration(), (time + lastUpdateTime)) == 0.0){
+                        }// else if( DoubleMath.subtract(subTask.getEstimatedDuration(), (time + lastUpdateTime)) == 0.0 || completionPercentage == 0){
+                        else if( DoubleMath.subtract((subTask.getExecStartTime()+subTask.getEstimatedDuration()), (new DateTime().getMillis()/1000 + time)) == 0.0){
                                 continue;
                         }