Changeset 481 for DCWoRMS/trunk/src/schedframe/scheduling/queue

Timestamp:

10/08/12 10:23:45 (13 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/schedframe/scheduling/queue/TaskQueue.java (modified) (3 diffs)

DCWoRMS/trunk/src/schedframe/scheduling/queue/TaskQueue.java

@@ -1 +1 @@
 package schedframe.scheduling.queue;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
 import gssim.schedframe.scheduling.queues.AbstractStatsSupportingQueue;
 
 import org.joda.time.DateTime;
 
-import schedframe.scheduling.tasks.WorkloadUnit;
+import schedframe.scheduling.tasks.TaskInterface;
 
-public class TaskQueue extends AbstractStatsSupportingQueue<WorkloadUnit> implements Queue<WorkloadUnit>{
-
+public class TaskQueue extends AbstractStatsSupportingQueue<TaskInterface<?>> implements Queue<TaskInterface<?>>{
 
         private static final long serialVersionUID = 6576299222910508209L;
@@ -17 +16 @@
         protected boolean supportReservation;
         
-        
         public TaskQueue (boolean supportReservation){
-                name = "Queue";
-                priority = 0;
+                this.name = "Queue";
+                this.priority = 0;
                 this.supportReservation = supportReservation;
-
         }
         
-        public boolean add(WorkloadUnit wu){
+        public boolean add(TaskInterface<?> task){
                 try {
-                        wu.setStatus(Gridlet.QUEUED);
+                        task.setStatus(DCWormsTags.QUEUED);
                 } catch(Exception e){
                         throw new RuntimeException(e);
                 }
-                //updateStats();
-                return super.add(wu);
+                return super.add(task);
         }
         
-        public void add(int pos, WorkloadUnit wu){
+        public void add(int pos, TaskInterface<?> task){
                 try {
-                        wu.setStatus(Gridlet.QUEUED);
+                        task.setStatus(DCWormsTags.QUEUED);
                 } catch(Exception e){
                         throw new RuntimeException(e);
                 }
-                //updateStats();
-                 super.add(pos, wu);
+                 super.add(pos, task);
         }
         
         public DateTime getArrivalTime(int pos) throws IndexOutOfBoundsException {
-                //return get(pos).getSubmissionTimeToBroker();
-                return null;
+                return get(pos).getSubmissionTimeToBroker();
         }
 
@@ -69 +63 @@
                 return supportReservation;
         }
-        
-        
-        /*public boolean contains (WorkloadUnitInterface<?> wu) {
-                for(int i = 0; i< size();i++){
-                        try {
-                                if(get(i).getId().equals(wu.getId()))
-                                        return true;
-                        } catch (NoSuchFieldException e) {
-                                return false;
-                        }
-                }
-                return false;
-        }
-        
-        public boolean remove (WorkloadUnitInterface<?> wu) {
-                boolean found = false;
-                int index = 0;
-                for(int i = 0; i< size() && !found;i++){
-                        try {
-                                if(get(i).getId().equals(wu.getId()))
-                                {
-                                        found = true;
-                                        index = i;
-                                }
-                                
-                        } catch (NoSuchFieldException e) {
-                                return false;
-                        }
-                }
-                remove(index);
-                return true;
-        }*/
 }