Changeset 539 for DCWoRMS/trunk/build/classes/example/globalplugin

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/build/classes/example/globalplugin

Files:

• BaseGlobalPlugin.class (modified) (previous)
• BaseGlobalPlugin.java (modified) (5 diffs)
• GridFCFSLoadBalancingPlugin.class (modified) (previous)
• GridFCFSLoadBalancingPlugin.java (modified) (4 diffs)
• GridFCFSRandomPlugin.class (modified) (previous)
• GridFCFSRandomPlugin.java (modified) (2 diffs)
• GridFCFSRoundRobinPlugin.class (modified) (previous)
• GridFCFSRoundRobinPlugin.java (modified) (3 diffs)

DCWoRMS/trunk/build/classes/example/globalplugin/BaseGlobalPlugin.java

@@ -4 +4 @@
 import schedframe.PluginConfiguration;
 import schedframe.events.scheduling.SchedulingEventType;
-import schedframe.scheduling.WorkloadUnitListImpl;
+import schedframe.scheduling.TaskList;
 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(TaskList 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);
                 }
@@ -46 +46 @@
         }
         
+        public String getName() {
+                return getClass().getName();
+        }
         
 }

DCWoRMS/trunk/build/classes/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,
@@ -53 +53 @@
                 
                 for(int i = 0; i < size; i++) {
-                        WorkloadUnit<?> job = q.remove(0);
+                        WorkloadUnit job = q.remove(0);
                         TaskInterface<?> task = (TaskInterface<?>)job;
 
@@ -74 +74 @@
         }
 
-        public String getName() {
-                return getClass().getName();
-        }
-
-        public void init(Properties properties) {
-                // no extra initialization is expected.
-        }
-        
         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);

DCWoRMS/trunk/build/classes/example/globalplugin/GridFCFSRandomPlugin.java

@@ -53 +53 @@
                 
                 for(int i = 0; i < size; i++) {
-                        WorkloadUnit<?> job = q.remove(0);
+                        WorkloadUnit job = q.remove(0);
                         TaskInterface<?> task = (TaskInterface<?>)job;
                         
@@ -75 +75 @@
         }
 
-
-        public String getName() {
-                return getClass().getName();
-        }
-
-        public void init(Properties properties) {
-                // no extra initialization is expected.
-        }
-
 }

DCWoRMS/trunk/build/classes/example/globalplugin/GridFCFSRoundRobinPlugin.java

@@ -47 +47 @@
                 
                 for(int i = 0; i < size; i++) {
-                        WorkloadUnit<?> job = q.remove(0);
+                        WorkloadUnit job = q.remove(0);
                         TaskInterface<?> task = (TaskInterface<?>)job;
                         
@@ -65 +65 @@
                         allocation.setProcessesCount(1);
                         allocation.setProviderName(sd.getProvider().getProviderId());
-                        System.out.println("----" + sd.getProvider().getProviderId());
                         ScheduledTask scheduledTask = new ScheduledTask(task);
                         scheduledTask.setTaskId(task.getId());
@@ -76 +75 @@
         }
 
-        public String getName() {
-                return getClass().getName();
-        }
-
-
 }