Changeset 478 for DCWoRMS/trunk/src/schedframe/scheduling/policy

Timestamp:

10/01/12 10:05:16 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/scheduling/policy

Files:

• AbstractManagementSystem.java (modified) (4 diffs)
• global/GlobalManagementSystem.java (modified) (5 diffs)
• local/LocalManagementSystem.java (modified) (5 diffs)

DCWoRMS/trunk/src/schedframe/scheduling/policy/AbstractManagementSystem.java

@@ -111 +111 @@
         }
 
-        public abstract void notifySubmittedWorkloadUnit(WorkloadUnit<?> wu, boolean ack);
-
-        public abstract void notifyCanceledWorkloadUnit(WorkloadUnit<?> wu);
-
-        public abstract void notifyReturnedWorkloadUnit(WorkloadUnit<?> wu);
+        public abstract void notifySubmittedWorkloadUnit(WorkloadUnit wu, boolean ack);
+
+        public abstract void notifyCanceledWorkloadUnit(WorkloadUnit wu);
+
+        public abstract void notifyReturnedWorkloadUnit(WorkloadUnit wu);
 
         protected abstract void executeSchedulingPlan(SchedulingPlanInterface decision);
@@ -122 +122 @@
 
         //POPRAWIC  (ale co? bo teraz chyba jest ok)
-        protected void submitWorkloadUnit(WorkloadUnit<?> wu, AllocationInterface allocation) {
+        protected void submitWorkloadUnit(WorkloadUnit wu, AllocationInterface allocation) {
                 String providerName = allocation.getProviderName();
                 if (providerName == null) {
@@ -164 +164 @@
         }
 
-        protected boolean sendFinishedWorkloadUnit(WorkloadUnit<?> wu) {
+        protected boolean sendFinishedWorkloadUnit(WorkloadUnit wu) {
                 
                 Executable exec = (Executable) wu;
@@ -220 +220 @@
         }
         
-        protected boolean removeFromQueue(WorkloadUnit<?> wu) {
+        protected boolean removeFromQueue(WorkloadUnit wu) {
                 for(TaskQueue queue : queues){
                         if(queue.contains(wu)){

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

@@ -81 +81 @@
         }
         
-        public void notifySubmittedWorkloadUnit(WorkloadUnit<?> wu, boolean ack) {
+        public void notifySubmittedWorkloadUnit(WorkloadUnit wu, boolean ack) {
                 if (!pluginSupportsEvent(GridSimTags.GRIDLET_SUBMIT)) {
                         log.error("Plugin " + schedulingPlugin.getClass()
@@ -106 +106 @@
         }
         
-        private void registerWorkloadUnit(WorkloadUnit<?> wu){
+        private void registerWorkloadUnit(WorkloadUnit wu){
                 if(!wu.isRegistered()){
                         wu.register(jobRegistry);
@@ -139 +139 @@
         }
         
-        public void notifyReturnedWorkloadUnit(WorkloadUnit<?> wu) {
+        public void notifyReturnedWorkloadUnit(WorkloadUnit wu) {
                 Executable exec = (Executable) wu;
 
@@ -189 +189 @@
         }
 
-        public void notifyCanceledWorkloadUnit(WorkloadUnit<?> wu){;
+        public void notifyCanceledWorkloadUnit(WorkloadUnit wu){;
 
                 Executable task = (Executable) wu;
@@ -251 +251 @@
         }
 
-        protected void submitWorkloadUnit(WorkloadUnit<?> job, AllocationInterface allocation) {
+        protected void submitWorkloadUnit(WorkloadUnit job, AllocationInterface allocation) {
 
                 String providerName = allocation.getProviderName();

DCWoRMS/trunk/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -192 +192 @@
         
 
-        public void notifyReturnedWorkloadUnit(WorkloadUnit<?> wu) {
+        public void notifyReturnedWorkloadUnit(WorkloadUnit wu) {
                 if (pluginSupportsEvent(WormsTags.TASK_EXECUTION_FINISHED)) {
                         SchedulingEvent event = new SchedulingEvent(SchedulingEventType.TASK_FINISHED);
@@ -204 +204 @@
         }
 
-        public void notifyCanceledWorkloadUnit(WorkloadUnit<?> job) {
+        public void notifyCanceledWorkloadUnit(WorkloadUnit job) {
 
                 if (!pluginSupportsEvent(GridSimTags.GRIDLET_CANCEL))
@@ -247 +247 @@
                                 ArrayList<AllocationInterface> allocations = taskDecision.getAllocations();
 
-                                WorkloadUnit<?> task = taskDecision.getTask();
+                                WorkloadUnit task = taskDecision.getTask();
                                 for (int j = 0; j < allocations.size(); j++) {
 
@@ -633 +633 @@
 
         
-        public void notifySubmittedWorkloadUnit(WorkloadUnit<?> job, boolean ack) {
+        public void notifySubmittedWorkloadUnit(WorkloadUnit job, boolean ack) {
                 updateProcessingProgress();
                 registerWorkloadUnit(job);
         }
 
-        private void registerWorkloadUnit(WorkloadUnit<?> wu){
+        private void registerWorkloadUnit(WorkloadUnit wu){
                 if(!wu.isRegistered()){
                         wu.register(jobRegistry);
@@ -660 +660 @@
                         }
 
-                        for(WorkloadUnit<?> e:readyTasks){      
+                        for(WorkloadUnit e:readyTasks){ 
                                 registerWorkloadUnit(e);
                         }