Changeset 1548 for DCWoRMS/branches

Timestamp:

02/12/15 13:16:07 (10 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks

Files:

• JobRegistry.java (modified) (2 diffs)
• JobRegistryImpl.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/JobRegistry.java

@@ -6 +6 @@
 
 import dcworms.schedframe.scheduling.ExecTask;
-
 import schedframe.ExecutablesList;
 import schedframe.resources.units.ResourceUnit;
@@ -32 +31 @@
         public List<ExecTask> getTasks(int status);
 
+        public List<ExecTask> getTasks(List<Integer> statusList, boolean match);
+
         public List<ExecTask> getQueuedTasks();
         

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java

@@ -4 +4 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -92 +93 @@
 
                 return taskList;
-        }
-
+                //return getTasks(Arrays.asList(status), true);
+        }
+
+        public List<ExecTask> getTasks(List<Integer> statusList, boolean match) {
+                List<ExecTask> taskList = new ArrayList<ExecTask>();
+                synchronized (executables)  {
+                        for (ExecTask task: executables) {
+                                for(int status: statusList){
+                                        if (compareStatus(task.getStatus(), status, match)) {
+                                                if(cr != null){
+                                                        if(!task.getAllocatedResources().isEmpty()){
+                                                                Set<ComputingResource> visitedResource = task.getAllocatedResources().getLast().getResources();
+                                                                if(visitedResource.contains(cr)){
+                                                                        taskList.add(task);
+                                                                } else {
+                                                                        for(ComputingResource res: visitedResource){
+                                                                                if(cr.contains(res)){
+                                                                                        taskList.add(task);
+                                                                                        break;
+                                                                                }
+                                                                        }
+                                                                }
+                                                        }
+                                                } else {
+                                                        if(!task.getAllocatedResources().isEmpty()){
+                                                                Set<String> visitedResource = task.getAllocatedResources().getLast().getResourceNames();
+                                                                for(String res: visitedResource){
+                                                                        if(res.equals(context) || res.substring(0, res.lastIndexOf("/")).contains(context)){
+                                                                                taskList.add(task);
+                                                                                break;
+                                                                        }
+                                                                }       
+                                                        }
+
+                                                        if(task.getSchedulerName().equals(context)) {
+                                                                taskList.add(task);
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
+
+                return taskList;
+        }
+        
+        private boolean compareStatus(int taskStatus, int status, boolean match){
+                if(match){
+                        if(taskStatus == status)
+                                return true;
+                } else {
+                        if(taskStatus !=status)
+                                return true;
+                }
+                return false;
+        }
+        
         public List<ExecTask> getQueuedTasks() {
                 return getTasks(DCWormsTags.QUEUED);