Changeset 539 for DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks

Timestamp:

10/31/12 13:52:06 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks

Files:

• AbstractProcesses.class (modified) (previous)
• AbstractProcesses.java (modified) (1 diff)
• Job.class (modified) (previous)
• Job.java (modified) (4 diffs)
• JobInterface.class (modified) (previous)
• JobInterface.java (modified) (3 diffs)
• Processes$1.class (modified) (previous)
• Processes.class (modified) (previous)
• Processes.java (modified) (2 diffs)
• Task$1.class (modified) (previous)
• Task.class (modified) (previous)
• Task.java (modified) (7 diffs)
• TaskInterface.class (modified) (previous)
• TaskInterface.java (modified) (7 diffs)
• WorkloadUnit.class (modified) (previous)
• WorkloadUnit.java (modified) (1 diff)

DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks/AbstractProcesses.java

@@ -3 +3 @@
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
 
-public abstract class AbstractProcesses<T> implements WorkloadUnit<T>{
+public abstract class AbstractProcesses implements WorkloadUnit{
         
         

DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks/Job.java

@@ -18 +18 @@
 import schedframe.scheduling.WorkloadUnitHandler;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
-import schedframe.scheduling.policy.AbstractManagementSystem;
 
 
@@ -179 +178 @@
         }
         
-        public int getUserID(){
+        public int getUserId(){
                 return this.senderId;
         }
@@ -204 +203 @@
                 
                 List<Task> readyTasks = new ArrayList<Task>();
-
                 int size = tasks.size();
+                
                 for(int i = 0; i < size; i++){
                         int parCnt;
@@ -216 +215 @@
                         } catch(Exception e){
                                 parCnt = 0;
-                                //e.printStackTrace();
-                        }
-                        if(parCnt == 0)
-                        {
+                        }
+                        if(parCnt == 0) {
                                 readyTasks.add(task);
                         }
-                        else
-                        {
+                        else {
                                 for(int j = 0; j < parCnt; j++){
                                         ParentType par = task.getDescription().getWorkflow().getParent(j);

DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks/JobInterface.java

@@ -11 +11 @@
  *
  */
-public interface JobInterface<T> extends WorkloadUnit<T> {
+public interface JobInterface<T> extends WorkloadUnit, DescriptionContainer<T> {
 
         /**
@@ -18 +18 @@
          * @throws NoSuchFieldException if there is no tasks for this job, and job id can not be obtained
          */
-        public abstract String getId() throws NoSuchFieldException;
+        //public abstract String getId() throws NoSuchFieldException;
         
         /**
@@ -44 +44 @@
          * @return constant which represents current status of this job
          */
-        public int getStatus();
+        //public int getStatus();
         
-        public int getUserID();
+        //public int getUserID();
 }

DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks/Processes.java

@@ -1 +1 @@
 package schedframe.scheduling.tasks;
-
-import java.util.List;
 
 import org.qcg.broker.schemas.resreqs.ComputingResourceBaseTypeItem;
@@ -196 +194 @@
         }
 
-        public org.qcg.broker.schemas.resreqs.Processes getDescription(){
-                return this.pr;
-        }
-
-        @Override
-        public List getTask() {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public TaskInterface getTask(String taskId) throws NoSuchFieldException {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public int getTaskCount() {
+        public int getStatus() {
+                return this.status;
+        }
+
+        @Override
+        public int getUserId() {
                 // TODO Auto-generated method stub
                 return 0;
         }
 
-        @Override
-        public int getStatus() {
-                // TODO Auto-generated method stub
-                return 0;
-        }
-
-        @Override
-        public int getUserID() {
-                // TODO Auto-generated method stub
-                return 0;
-        }
-
-        @Override
-        public String getDocument() throws Exception {
-                // TODO Auto-generated method stub
-                return null;
-        }
+
 
         @Override

DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks/Task.java

@@ -30 +30 @@
 import schedframe.scheduling.WorkloadUnitHandler;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
-import schedframe.scheduling.policy.AbstractManagementSystem;
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
 
@@ -38 +37 @@
  *
  */
-public class Task /*extends AbstractTask*/ implements TaskInterface<org.qcg.broker.schemas.resreqs.Task> {
+public class Task implements TaskInterface<org.qcg.broker.schemas.resreqs.Task> {
         
         protected static Unmarshaller unmarshaller;
@@ -72 +71 @@
         private int senderId;
         private long workloadLogWaitTime;
-        //String resPathHistory;
-        
+
         public Task(org.qcg.broker.schemas.resreqs.Task task){
                 this.task = task;
@@ -80 +78 @@
                 this.brokerSubmitTime = null;
                 this.duration = null;
-        //      this.gridletID_ = (getJobId() + "_" + getId()).hashCode();
                 prepareTopology();
         }
@@ -91 +88 @@
                 this.brokerSubmitTime = null;
                 this.duration = null;
-        //      this.gridletID_ = (getJobId() + getId()).hashCode();
                 prepareTopology();
         }
@@ -269 +265 @@
         }
 
-        public String getUserDn() {
+        public String getUserDN() {
                 return this.task.getUserDN();
         }
@@ -471 +467 @@
         }*/
 
+
         @Override
-        public List <Task> getTask() {
-                List<Task> tasks = new ArrayList<Task>();
-                tasks.add(this);
-                return tasks;
-        }
-
-        @Override
-        public Task getTask(String taskId) throws NoSuchFieldException {
-                // TODO Auto-generated method stub
-                return null;
-        }
-
-        @Override
-        public int getTaskCount() {
+        public int getUserId() {
                 // TODO Auto-generated method stub
                 return 0;
         }
 
-        @Override
-        public int getUserID() {
-                // TODO Auto-generated method stub
-                return 0;
-        }
-
         public boolean isRegistered() {
                 return isRegistered;

DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks/TaskInterface.java

@@ -6 +6 @@
 import org.joda.time.ReadableDuration;
 
+import schedframe.DescriptionContainer;
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
 
@@ -14 +15 @@
  *
  */
-public interface TaskInterface<T> extends WorkloadUnit<T> {
+public interface TaskInterface<T> extends WorkloadUnit, DescriptionContainer<T> {
         
         /**
@@ -20 +21 @@
          * @return task identifier
          */
-        public abstract String getId();
+        //public abstract String getId();
         
         /**
@@ -33 +34 @@
          * submitted this task. 
          */
-        public abstract String getUserDn();
+        public abstract String getUserDN();
         
         /**
@@ -87 +88 @@
          */
         public long getLength();
-        
-        /**
-         * 
-         * @param length measured in instructions.
-         */
-        public void setLength(long length);
-        
+
         /**
          * 
          * @return constant which represent current task status
          */
-        public int getStatus();
+        //public int getStatus();
         
         
@@ -107 +102 @@
         public List<AbstractProcesses> getProcesses(AbstractProcessesGroup processGroup);
         
-        public void setStatus(int status) throws Exception;
+        //public void setStatus(int status) throws Exception;
         
         public double getCpuCntRequest() throws NoSuchFieldException;
@@ -114 +109 @@
         
         public long getWorkloadLogWaitTime();
-        
-        //public void addToResPath(String resName);
-        
-        //public String getResPath();
+
                 
 }

DCWoRMS/trunk/build/classes/schedframe/scheduling/tasks/WorkloadUnit.java

@@ -1 +1 @@
 package schedframe.scheduling.tasks;
 
-import java.util.List;
-
-import schedframe.DescriptionContainer;
 import schedframe.scheduling.WorkloadUnitHandler;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
-import schedframe.scheduling.policy.AbstractManagementSystem;
 
-public interface WorkloadUnit<T> extends DescriptionContainer<T> {
+public interface WorkloadUnit {
 
-        /**
-         * 
-         * @return job identifier
-         * @throws NoSuchFieldException if there is no tasks for this job, and job id can not be obtained
-         */
-        public abstract String getId() throws NoSuchFieldException;
+        public String getId();
         
-        /**
-         * 
-         * @return list of tasks which belongs to this job
-         */
-        public abstract List<? extends TaskInterface<?>> getTask();
+        public int getUserId();
         
-        /**
-         * 
-         * @param taskId
-         * @return task with specified taskId
-         * @throws NoSuchFieldException if task with taskId does not exist in this job
-         */
-        public abstract TaskInterface<?> getTask(String taskId) throws NoSuchFieldException;
-        
-        /**
-         * 
-         * @return number of tasks in this job 
-         */
-        public abstract int getTaskCount();
-        
-        /**
-         * 
-         * @return constant which represents current status of this job
-         */
         public int getStatus();
         
         public void setStatus(int status) throws Exception;
-        
+
         public boolean isFinished();
-        
-        public int getUserID();
-        
+
         public boolean isRegistered();