Changeset 1151 for DCWoRMS/branches/coolemall/src/schedframe

Timestamp:

07/31/13 15:29:05 (12 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• AbstractJobRegistry.java (modified) (3 diffs)
• JobRegistry.java (modified) (2 diffs)
• JobRegistryImpl.java (modified) (5 diffs)

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

@@ -2 +2 @@
 
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import schedframe.scheduling.tasks.Job;
@@ -24 +23 @@
         
         public boolean addJob(JobInterface<?> job) {
-                jobs.put(job.getId(),  job);
+                jobs.put(job.getId(), job);
                 return true;
         }
@@ -58 +57 @@
                 return (Job)jobs.get(jobId);
         }
+        
+        public List<JobInterface<?>> getJobs(){
+                List<JobInterface<?>> jobList = new ArrayList<JobInterface<?>>();
+                for(String jobId:jobs.keySet()) {
+                        jobList.add(jobs.get(jobId));
+                }
+                return jobList;
+        }
+
+        public List<JobInterface<?>> getJobs(int status) {
+                List<JobInterface<?>> jobList = new ArrayList<JobInterface<?>>();
+                synchronized (jobs) {
+                        for(String jobId:jobs.keySet()){
+                                JobInterface<?> job = jobs.get(jobId);
+                                if (job.getStatus() == status) {
+                                        jobList.add(job);
+                                }
+                        }
+                }
+                return jobList;
+        }
 
 }

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

@@ -14 +14 @@
 
         public JobInterface<?> getJobInfo(String jobId);
+        
+        public List<JobInterface<?>> getJobs();
+        
+        public List<JobInterface<?>> getJobs(int status);
+        
 
         public TaskInterface<?> getTaskInfo(String jobId, String taskId);
+        
+        public ExecutablesList getTasks(); 
+        
+        public ExecTask getTask(String jobId, String taskId);
 
         
@@ -28 +37 @@
         public List<ExecTask> getFinishedTasks();
 
-
-        public ExecutablesList getExecutableTasks(); 
-        
-        public ExecTask getExecutable(String jobId, String taskId);
-
         
         public List<? extends TaskInterface<?>> getAvailableTasks(List<JobInterface<?>> jobsList);

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

@@ -38 +38 @@
 
         public boolean addExecTask(ExecTask newTask) {
-                if(getExecutable(newTask.getJobId(), newTask.getId()) == null) {
+                if(getTask(newTask.getJobId(), newTask.getId()) == null) {
                         synchronized (executables)  {
                                 executables.add(newTask);
@@ -47 +47 @@
         }
 
-        public ExecutablesList getExecutableTasks() {
+        public ExecutablesList getTasks() {
                 return executables;
         }
@@ -81 +81 @@
         }
         
-        public ExecTask getExecutable(String jobId, String taskId){
+        public ExecTask getTask(String jobId, String taskId){
                 synchronized (executables)  {
                         for (ExecTask task : executables) {
@@ -93 +93 @@
 
         @SuppressWarnings("unchecked")
-        public List<Task> getAvailableTasks(List<JobInterface<?>> wuList) {
+        public List<Task> getAvailableTasks(List<JobInterface<?>> jobList) {
                 List<Task> availableTasks = new ArrayList<Task>();
                 List<Task> waitingTasks = new ArrayList<Task>();
                 
-                for(int i = 0; i < wuList.size(); i++){
-                        JobInterface<?> wu  = (JobInterface<?>)wuList.get(i);
-                        waitingTasks.addAll((List<Task>)wu.getTask());
+                for(int i = 0; i < jobList.size(); i++){
+                        JobInterface<?> job = (JobInterface<?>)jobList.get(i);
+                        waitingTasks.addAll((List<Task>)job.getTask());
                 }
 
@@ -178 +178 @@
                                                 ParentType par = w.getParent(j);
                                                 if(par.getTriggerState().compareTo(TaskStatesName.FINISHED) == 0){
-                                                        if(!checkTaskCompletion(task.getJobId(), par.getContent())){
+                                                        if(par.getContent().contains("_")){
+                                                                if(!checkTaskCompletion(par.getContent().split("_")[0], par.getContent().split("_")[1])){
+                                                                        continue;
+                                                                }
+                                                        }
+                                                        else if(!checkTaskCompletion(task.getJobId(), par.getContent())){
                                                                 continue;
                                                         }