Changeset 539 for DCWoRMS/trunk/build/classes/schedframe/scheduling/Scheduler.java

Timestamp:

10/31/12 13:52:06 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/build/classes/schedframe/scheduling/Scheduler.java (modified) (10 diffs)

DCWoRMS/trunk/build/classes/schedframe/scheduling/Scheduler.java

@@ -8 +8 @@
 import gridsim.GridSimTags;
 import gridsim.IO_data;
-import gridsim.gssim.WormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;
@@ -28 +28 @@
 import schedframe.scheduling.manager.resources.ManagedResources;
 import schedframe.scheduling.policy.AbstractManagementSystem;
+import schedframe.scheduling.queue.QueueDescription;
 import schedframe.scheduling.queue.TaskQueue;
-import schedframe.scheduling.queue.QueueDescription;
 import schedframe.scheduling.tasks.WorkloadUnit;
 
@@ -117 +117 @@
                                 if (obj != null) {
                                         int delay = (Integer) obj;
-                                        send(this.get_id(), delay, WormsTags.TIMER);
+                                        send(this.get_id(), delay, DCWormsTags.TIMER);
                                 }
                         }
@@ -133 +133 @@
                                 // managemetnSystem_.setEndSimulation();
                                 run = false;
-                                /*Sim_stat stats = get_stat();
-                                List<Object[]> measures = stats.get_measures();
-                                for (Object[] info : measures) {
-                                        String measure = (String) info[0];
-                                        if (measure
-                                                        .startsWith(GssimConstants.TASKS_QUEUE_LENGTH_MEASURE_NAME)) {
-                                                System.out.println("====="+this.get_name()+";"+stats.average(measure));
-                                        }
-                                }*/
                                 break;
                         }
@@ -155 +146 @@
 
                 case GridSimTags.GRIDLET_SUBMIT:
-                        processGSSIMJobSubmit(ev, false);
+                        processWorkloadUnitSubmit(ev, false);
                         break;
 
                 case GridSimTags.GRIDLET_SUBMIT_ACK:
-                        processGSSIMJobSubmit(ev, true);
+                        processWorkloadUnitSubmit(ev, true);
                         break;
 
                 case GridSimTags.GRIDLET_RETURN:
-                        processGSSIMJobReturn(ev);
+                        processWorkloadUnitReturn(ev);
                         break;
 
@@ -174 +165 @@
         protected void processOtherRequest(Sim_event ev) {
                 switch (ev.get_tag()) {
-                case WormsTags.QUERY_RESOURCE_DESC:
+                case DCWormsTags.QUERY_RESOURCE_DESC:
                         SchedulerDescription desc = new SchedulerDescription(new LocalSystem(get_name(), null, null));
                         Map<ResourceUnitName, List<ResourceUnit>> units = managementSystem.getResourceManager().getSharedResourceUnits();
@@ -181 +172 @@
 
                         IO_data data = new IO_data(desc, 0, ev.get_src());
-                        send(ev.get_src(), GridSimTags.SCHEDULE_NOW, WormsTags.QUERY_RESOURCE_DESC_RESULT, data);
+                        send(ev.get_src(), GridSimTags.SCHEDULE_NOW, DCWormsTags.QUERY_RESOURCE_DESC_RESULT, data);
                         break;
 
@@ -189 +180 @@
                 }
         }
-        
-        /*public boolean processOtherEvent(Sim_event ev) {
-                return false;
-        }*/
-        
-        protected void processGSSIMJobReturn(Sim_event ev) {
-                WorkloadUnit<?> job = (WorkloadUnit<?>) ev.get_data();
+
+        protected void processWorkloadUnitReturn(Sim_event ev) {
+                WorkloadUnit job = (WorkloadUnit) ev.get_data();
                 managementSystem.notifyReturnedWorkloadUnit(job);
         }
 
-        protected void processGSSIMJobSubmit(Sim_event ev, boolean ack) {
-                WorkloadUnit<?> job = (WorkloadUnit<?>) ev.get_data();
+        protected void processWorkloadUnitSubmit(Sim_event ev, boolean ack) {
+                WorkloadUnit job = (WorkloadUnit) ev.get_data();
                 managementSystem.notifySubmittedWorkloadUnit(job, ack);
         }
@@ -223 +210 @@
                 this.send(this.get_id(), delay, tag, data);
         }
-        
-        /*protected void send(int dest, int tag, int transaction, Object obj){
-                IO_data data = new Transaction_IO_data(transaction, obj, 8, dest);
-                super.send(dest, GridSimTags.SCHEDULE_NOW, tag, data);
-        }*/
         
         public Sim_port getOutputPort() {
@@ -271 +253 @@
         public List<QueueDescription> getQueuesDescription(){
                 List<QueueDescription> queues = new ArrayList<QueueDescription>();
-                for(TaskQueue queue: managementSystem.getAccessQueues()){
+                for(TaskQueue queue: managementSystem.getQueues()){
                         QueueDescription qd;
                         try {