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

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/example/localplugin

Files:

• BaseLocalSchedulingPlugin.java (modified) (4 diffs)
• FCFSCPUFreqScalingClusterLocalPlugin.java (modified) (7 diffs)
• FCFSClusterLocalPlugin.java (modified) (2 diffs)
• FCFSConsolidationClusterLocalPlugin.java (modified) (3 diffs)
• FCFSEnergyAwareClusterLocalPlugin.java (modified) (3 diffs)
• FCFSNodePowerManagementClusterLocalPlugin.java (modified) (3 diffs)
• FCFSRandomClusterLocalPlugin.java (modified) (2 diffs)
• FCFS_BFLocalPlugin.java (modified) (2 diffs)
• RackLocalPlugin.java (modified) (3 diffs)

DCWoRMS/trunk/src/example/localplugin/BaseLocalSchedulingPlugin.java

@@ -10 +10 @@
 import schedframe.resources.units.ResourceUnit;
 import schedframe.resources.units.ResourceUnitName;
-import schedframe.scheduling.WorkloadUnitListImpl;
+import schedframe.scheduling.TaskListImpl;
 import schedframe.scheduling.manager.resources.ResourceManager;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
@@ -22 +22 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import schedframe.scheduling.tasks.WorkloadUnit;
 import schemas.StringValueWithUnit;
 
@@ -46 +45 @@
         }
         
-        public int placeJobsInQueues(WorkloadUnitListImpl newJobs,
+        public int placeTasksInQueues(TaskListImpl newTasks,
                         TaskQueueList queues, 
                         ResourceManager resourceManager, ModuleList moduleList) {
@@ -53 +52 @@
                 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/localplugin/FCFSCPUFreqScalingClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
+import gssim.schedframe.scheduling.Executable;
 
 import java.util.ArrayList;
@@ -28 +29 @@
 import schedframe.scheduling.queue.TaskQueue;
 import schedframe.scheduling.queue.TaskQueueList;
-import schedframe.scheduling.tasks.SubmittedTask;
 import schedframe.scheduling.tasks.TaskInterface;
 import schedframe.scheduling.tasks.WorkloadUnit;
@@ -39 +39 @@
         }
 
-        public SchedulingPlanInterface schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
+        public SchedulingPlanInterface<?> schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
                         ResourceManager resManager, ModuleList modules) {
 
@@ -58 +58 @@
                                 TaskInterface<?> task = (TaskInterface<?>) job;
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
 
                                         Map<ResourceUnitName, ResourceUnit> choosenResources = chooseResourcesForExecution(resourceManager, task);
@@ -76 +76 @@
                 case TASK_FINISHED:
                         TaskFinishedEvent finEvent = (TaskFinishedEvent) event;
-                        SubmittedTask subTask = (SubmittedTask )jobRegistry.getSubmittedTask(finEvent.getJobId(), finEvent.getTaskId());
-                        UsedResourceList<ResourceHistoryItem> usedResourcesList = subTask.getUsedResources();
+                        Executable exec = (Executable) jobRegistry.getExecutable(finEvent.getJobId(), finEvent.getTaskId());
+                        UsedResourceList<ResourceHistoryItem> usedResourcesList = exec.getUsedResources();
                         ProcessingElements pes = (ProcessingElements)usedResourcesList.getLast().getResourceUnits().get(StandardResourceUnitName.PE);
                         List<Processor> processors =  new ArrayList<Processor>();
@@ -89 +89 @@
                 case TASK_REQUESTED_TIME_EXPIRED:
                         TaskRequestedTimeExpiredEvent timExpEvent = (TaskRequestedTimeExpiredEvent) event;
-                         subTask = (SubmittedTask )jobRegistry.getSubmittedTask(timExpEvent.getJobId(), timExpEvent.getTaskId());
-                        usedResourcesList = subTask.getUsedResources();
+                        exec = (Executable) jobRegistry.getExecutable(timExpEvent.getJobId(), timExpEvent.getTaskId());
+                        usedResourcesList = exec.getUsedResources();
                         pes = (ProcessingElements)usedResourcesList.getLast().getResourceUnits().get(StandardResourceUnitName.PE);
                         processors =  new ArrayList<Processor>();
@@ -101 +101 @@
                                 TaskInterface<?> task = (TaskInterface<?>) job;
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
 
                                         Map<ResourceUnitName, ResourceUnit> choosenResources = chooseResourcesForExecution(resourceManager, task);

DCWoRMS/trunk/src/example/localplugin/FCFSClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
 
 import java.util.ArrayList;
@@ -52 +52 @@
                                 TaskInterface<?> task = (TaskInterface<?>) job;
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
                                         
                                         /****************3 ways to schedule task****************/

DCWoRMS/trunk/src/example/localplugin/FCFSConsolidationClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
 
 import java.util.ArrayList;
@@ -35 +35 @@
         }
 
-        public SchedulingPlanInterface schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
+        public SchedulingPlanInterface<?> schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
                         ResourceManager resManager, ModuleList modules) {
 
@@ -54 +54 @@
                                 TaskInterface<?> task = (TaskInterface<?>) job;
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
 
                                         Map<ResourceUnitName, ResourceUnit> choosenResources = null;

DCWoRMS/trunk/src/example/localplugin/FCFSEnergyAwareClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
 
 import java.util.ArrayList;
@@ -26 +26 @@
         }
 
-        public SchedulingPlanInterface schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
+        public SchedulingPlanInterface<?> schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
                         ResourceManager resManager, ModuleList modules) {
 
@@ -45 +45 @@
                                 TaskInterface<?> task = (TaskInterface<?>) job;
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
 
                                         String nodeName = chooseProviderForExecution(resourceManager, task);

DCWoRMS/trunk/src/example/localplugin/FCFSNodePowerManagementClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
 
 import java.util.ArrayList;
@@ -35 +35 @@
         }
 
-        public SchedulingPlanInterface schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
+        public SchedulingPlanInterface<?> schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
                         ResourceManager resManager, ModuleList modules) {
 
@@ -54 +54 @@
                                 TaskInterface<?> task = (TaskInterface<?>) job;
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
 
                                         Map<ResourceUnitName, ResourceUnit> choosenResources = chooseResourcesForExecution(resourceManager, task);

DCWoRMS/trunk/src/example/localplugin/FCFSRandomClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
 
 import java.util.List;
@@ -47 +47 @@
                                 TaskInterface<?> task = (TaskInterface<?>) job;
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
                                         /*for(ResourceUnitName key:resManager.getSharedResourceUnits().keySet()){
                                                 System.out.println(key.getName());

DCWoRMS/trunk/src/example/localplugin/FCFS_BFLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.scheduling.manager.resources.ResourceManager;
@@ -33 +33 @@
                                 
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
                                         addToSchedulingPlan(plan, task);
                                 }

DCWoRMS/trunk/src/example/localplugin/RackLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.Gridlet;
+import gridsim.gssim.DCWormsTags;
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.scheduling.manager.resources.ClusterResourceManager;
@@ -19 +19 @@
         }
 
-        public SchedulingPlanInterface schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
+        public SchedulingPlanInterface<?> schedule(SchedulingEvent event, TaskQueueList queues, JobRegistry jobRegistry,
                         ResourceManager resManager, ModuleList modules) {
 
@@ -39 +39 @@
                                 TaskInterface<?> task = (TaskInterface<?>) job;
                                 // if status of the tasks in READY
-                                if (task.getStatus() == Gridlet.READY) {
+                                if (task.getStatus() == DCWormsTags.READY) {
                                         System.out.println(resourceManager.getSchedulers().get(0).get_name());
                                         String nodeName = resourceManager.getSchedulers().get(0).get_name();