Changeset 490 for DCWoRMS/trunk/src/schedframe/scheduling/policy/AbstractManagementSystem.java

Timestamp:

10/09/12 13:58:06 (13 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/schedframe/scheduling/policy/AbstractManagementSystem.java (modified) (4 diffs)

DCWoRMS/trunk/src/schedframe/scheduling/policy/AbstractManagementSystem.java

@@ -7 +7 @@
 import org.apache.commons.logging.LogFactory;
 import org.joda.time.DateTimeUtilsExt;
+
+import dcworms.schedframe.scheduling.ExecTask;
+import dcworms.schedframe.scheduling.Executable;
+import dcworms.schedframe.scheduling.queues.AbstractStatsSupportingQueue;
 
 import schedframe.PluginConfiguration;
@@ -34 +38 @@
 import gridsim.IO_data;
 import gridsim.gssim.DCWormsTags;
-import gssim.schedframe.scheduling.ExecTask;
-import gssim.schedframe.scheduling.Executable;
-import gssim.schedframe.scheduling.queues.AbstractStatsSupportingQueue;
 
 public abstract class AbstractManagementSystem {
@@ -144 +145 @@
                         return;
                 }
-                //Executable exec = (Executable) wu;
                 removeFromQueue(task);
                 scheduler.send(providerName, GridSimTags.SCHEDULE_NOW, GridSimTags.GRIDLET_SUBMIT, task);       
@@ -199 +199 @@
         }
         
-        protected boolean removeFromQueue(WorkloadUnit wu) {
+        protected boolean removeFromQueue(TaskInterface<?> task) {
                 for(TaskQueue queue : queues){
-                        if(queue.contains(wu)){
-                                queue.remove(wu);
+                        if(queue.contains(task)){
+                                queue.remove(task);
                                 return true;
                         }