Changeset 490 for DCWoRMS/trunk/src/schedframe/scheduling/policy/global

Timestamp:

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

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/schedframe/scheduling/policy/global/GlobalManagementSystem.java (modified) (11 diffs)

DCWoRMS/trunk/src/schedframe/scheduling/policy/global/GlobalManagementSystem.java

@@ -11 +11 @@
 import org.qcg.broker.schemas.schedulingplan.types.AllocationStatus;
 
+import dcworms.schedframe.scheduling.ExecTask;
+import dcworms.schedframe.scheduling.Executable;
+
 import qcg.shared.constants.BrokerConstants;
-import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.events.scheduling.TaskArrivedEvent;
 import schedframe.events.scheduling.TimerEvent;
+import schedframe.scheduling.TaskListImpl;
 import schedframe.scheduling.WorkloadUnitHandler;
-import schedframe.scheduling.TaskListImpl;
 import schedframe.scheduling.plan.AllocationInterface;
 import schedframe.scheduling.plan.ScheduledTaskInterface;
@@ -35 +37 @@
 import gridsim.IO_data;
 import gridsim.gssim.DCWormsTags;
-import gssim.schedframe.scheduling.ExecTask;
-import gssim.schedframe.scheduling.Executable;
 
 public class GlobalManagementSystem extends AbstractManagementSystem {
@@ -80 +80 @@
                 
                 registerWorkloadUnit(wu);
-                /*Job job = (Job) wu;
-                jobRegistry.addJob(job);
-
-                if (log.isInfoEnabled())
-                        log.info("Received job " + job.getId() + " at " + new DateTime(DateTimeUtilsExt.currentTimeMillis()));
-
-                List<JobInterface<?>> jobsList = new ArrayList<JobInterface<?>>();
-                jobsList.add(job);
-                WorkloadUnitList readyWorkloadUnits = new WorkloadUnitList();
-                readyWorkloadUnits.addAll(jobRegistry.getReadyTasks(jobsList));
-                schedulingPlugin.placeJobsInQueues(readyWorkloadUnits, queues, getResourceManager(), moduleList);
-
-                schedule(new TaskArrivedEvent());*/
 
         }
@@ -104 +91 @@
         
 
-        protected void scheduleAvaialbleTasks(Job job){
+        protected void schedule(JobInterface<?> job){
                 List<JobInterface<?>> jobsList = new ArrayList<JobInterface<?>>();
                 jobsList.add(job);
@@ -111 +98 @@
                 
                 schedulingPlugin.placeTasksInQueues(readyTasks, queues, getResourceManager(), moduleList);
-                schedule(new TaskArrivedEvent());
-        }
-        
-        protected void schedule(SchedulingEvent schedulingEvent) {
-
                 SchedulingPlanInterface<?> decision = schedulingPlugin.schedule(
-                                schedulingEvent, queues, getJobRegistry(),  getResourceManager(), moduleList);
+                                new TaskArrivedEvent(), queues, getJobRegistry(),  getResourceManager(), moduleList);
                 if (decision != null)
                         executeSchedulingPlan(decision);
         }
-        
+
         public void notifyReturnedWorkloadUnit(WorkloadUnit wu) {
                 Executable exec = (Executable) wu;
@@ -133 +115 @@
                 try {
                         Job job = jobRegistry.getJob(exec.getJobId());
-                        /*Task task = job.getTask(exec.getTaskId());
+                        Task task = job.getTask(exec.getTaskId());
                         if(exec.getProcessesId() == null){
                                 try {
                                         task.setStatus(exec.getStatus());
                                 } catch (Exception e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
+
                                 }
                         } else {
@@ -150 +131 @@
                                         }
                                 }
-                        }*/
+                        }
                         
                         if(job.isFinished()){
@@ -156 +137 @@
                         }
                         else {
-                                scheduleAvaialbleTasks(job);
-                                /*List<JobInterface<?>> jobs = new ArrayList<JobInterface<?>>();
-                                jobs.add(jobRegistry.getJobInfo(job.getId()));
-                                WorkloadUnitList readyWorkloadUnits = new WorkloadUnitList();
-                                readyWorkloadUnits.addAll(jobRegistry.getReadyTasks(jobs));
-                                schedulingPlugin.placeJobsInQueues(readyWorkloadUnits, queues,
-                                                getResourceManager(), moduleList);
-                                schedule(new TaskArrivedEvent());*/
+                                schedule(job);
                         }
                         
@@ -269 +243 @@
                 IO_data data = new IO_data(task, 0, resID);
                 scheduler.send(scheduler.getOutputPort(), GridSimTags.SCHEDULE_NOW, GridSimTags.GRIDLET_SUBMIT, data);  
-                
-                //scheduler.send(providerName, GridSimTags.SCHEDULE_NOW, GridSimTags.GRIDLET_SUBMIT, job);                      
+                //scheduler.send(providerName, GridSimTags.SCHEDULE_NOW, GridSimTags.GRIDLET_SUBMIT, job);      
+                
                 if(log.isDebugEnabled())
                         log.debug("Submitted job " + task.getId() + " to " + providerName);
@@ -278 +252 @@
         class GlobalWorkloadUnitHandler implements  WorkloadUnitHandler{
 
-                public void handleJob(Job job){
-
+                public void handleJob(JobInterface<?> job){
                         if (log.isInfoEnabled())
                                 log.info("Received job " + job.getId() + " at " + new DateTime(DateTimeUtilsExt.currentTimeMillis()));
 
                         jobRegistry.addJob(job);
-                        scheduleAvaialbleTasks(job);
+                        schedule(job);
                 }
                 
@@ -294 +267 @@
                         throw new RuntimeException("Not implemented since it isn't expected that tasks are send directly to the global scheduler.");
                 }
-
         }