Changeset 481 for DCWoRMS/trunk/src/example/globalplugin

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/example/globalplugin

Files:

• BaseGlobalPlugin.java (modified) (4 diffs)
• GridFCFSLoadBalancingPlugin.java (modified) (3 diffs)

DCWoRMS/trunk/src/example/globalplugin/BaseGlobalPlugin.java

@@ -4 +4 @@
 import schedframe.PluginConfiguration;
 import schedframe.events.scheduling.SchedulingEventType;
-import schedframe.scheduling.WorkloadUnitListImpl;
+import schedframe.scheduling.TaskListImpl;
 import schedframe.scheduling.manager.resources.ResourceManager;
 import schedframe.scheduling.plugin.SchedulingPluginConfiguration;
@@ -11 +11 @@
 import schedframe.scheduling.queue.TaskQueue;
 import schedframe.scheduling.queue.TaskQueueList;
-import schedframe.scheduling.tasks.WorkloadUnit;
+import schedframe.scheduling.tasks.TaskInterface;
 import schemas.StringValueWithUnit;
 
@@ -22 +22 @@
         }
         
-        public int placeJobsInQueues(WorkloadUnitListImpl newJobs, TaskQueueList queues, ResourceManager resourceManager,
+        public int placeTasksInQueues(TaskListImpl newTasks, TaskQueueList queues, ResourceManager resourceManager,
                         ModuleList moduleList) {
 
@@ -28 +28 @@
                 TaskQueue queue = queues.get(0);
 
-                for (int i = 0; i < newJobs.size(); i++) {
-                        WorkloadUnit task = newJobs.get(i);
+                for (int i = 0; i < newTasks.size(); i++) {
+                        TaskInterface<?> task = newTasks.get(i);
                         queue.add(task);
                 }

DCWoRMS/trunk/src/example/globalplugin/GridFCFSLoadBalancingPlugin.java

@@ -19 +19 @@
 import schedframe.scheduling.plugin.grid.ModuleList;
 import schedframe.scheduling.plugin.grid.ResourceDiscovery;
+import schedframe.scheduling.queue.QueueDescription;
 import schedframe.scheduling.queue.TaskQueue;
-import schedframe.scheduling.queue.QueueDescription;
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
@@ -29 +29 @@
         private Log log = LogFactory.getLog(GridFCFSLoadBalancingPlugin.class);
         
-        public SchedulingPlanInterface schedule(SchedulingEvent event,
+        public SchedulingPlanInterface<?> schedule(SchedulingEvent event,
                         TaskQueueList queues, 
                         JobRegistry jobRegistry,
@@ -83 +83 @@
         
         private int findLeastLoadedResourceIdx(List<SchedulerDescription> availableResources){
-                
                 int resourceIdx = -1;
                 long minLoad = Long.MAX_VALUE;
+                
                 for(int i = 0; i < availableResources.size(); i++){
                         SchedulerDescription sd = availableResources.get(i);