Changeset 1396 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/Job.java

Timestamp:

06/26/14 14:18:01 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/Job.java (modified) (3 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/Job.java

@@ -1 +1 @@
 package schedframe.scheduling.tasks;
-
-
-import org.qcg.broker.schemas.resreqs.ParentType;
-import org.qcg.broker.schemas.resreqs.ResourceRequirements;
-import org.qcg.broker.schemas.resreqs.Workflow;
-import org.qcg.broker.schemas.resreqs.types.TaskStatesName;
 
 
@@ -15 +9 @@
 
 import org.joda.time.DateTime;
+import org.qcg.broker.schemas.resreqs.ResourceRequirements;
 
 import qcg.shared.constants.BrokerConstants;
-
 import schedframe.scheduling.WorkloadUnitHandler;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
@@ -210 +204 @@
         }
         
-        private List<Task> getReadyTasks() throws NoSuchFieldException{
-                
-                List<Task> availableTasks = new ArrayList<Task>();
-                int size = tasks.size();
-                
-                for(int i = 0; i < size; i++){
-                        int parCnt;
-                        int previousTaskSucceedCnt = 0;
-                        Task task = tasks.get(i);
-                        if(task.getStatus() != (int)BrokerConstants.TASK_STATUS_UNSUBMITTED)
-                                continue;
-                        //the following procedure supports only one nested structure
-                        Workflow w = task.getDescription().getWorkflow();
-                        if (w == null){
-                                availableTasks.add(task);
-                                continue;
-                        }
-                        if(w.getAnd() != null) {
-                                parCnt = w.getAnd().getParentOpTypeItemCount();
-                                if(parCnt == 0){
-                                        availableTasks.add(task);
-                                }else
-                                {
-                                        for(int j = 0; j < parCnt; j++){
-                                                ParentType par = w.getAnd().getParentOpTypeItem(j).getParent();
-                                                if(par.getTriggerState().compareTo(TaskStatesName.FINISHED) == 0){
-                                                        if(!getTask(par.getContent()).isFinished()){
-                                                                break;
-                                                        }
-                                                }
-                                                previousTaskSucceedCnt++;
-                                        }
-
-                                        if(previousTaskSucceedCnt == parCnt)
-                                                availableTasks.add(task);
-                                }
-                        } 
-                        else if(w.getOr() != null) {
-                                parCnt = w.getOr().getParentOpTypeItemCount();
-                                if(parCnt == 0){
-                                        availableTasks.add(task);
-                                }
-                                else{
-                                        for(int j = 0; j < parCnt; j++){
-                                                ParentType par = w.getOr().getParentOpTypeItem(j).getParent();
-                                                if(par.getTriggerState().compareTo(TaskStatesName.FINISHED) == 0){
-                                                        if(!getTask(par.getContent()).isFinished()){
-                                                                continue;
-                                                        }
-                                                }
-                                                previousTaskSucceedCnt++;
-                                        }
-
-                                        if(previousTaskSucceedCnt > 0)
-                                                availableTasks.add(task);
-                                }
-                        }
-                        else {
-                                parCnt = w.getParentCount();
-                                if(parCnt == 0){
-                                        availableTasks.add(task);
-                                }else{
-                                        for(int j = 0; j < parCnt; j++){
-                                                ParentType par = w.getParent(j);
-                                                if(par.getTriggerState().compareTo(TaskStatesName.FINISHED) == 0){
-                                                        if(!getTask(par.getContent()).isFinished()){
-                                                                continue;
-                                                        }
-                                                }
-                                                previousTaskSucceedCnt++;
-                                        }
-
-                                        if(previousTaskSucceedCnt == parCnt)
-                                                availableTasks.add(task);
-                                }
-                        }
-                }               
-                return availableTasks;
-        }
-        
 }