Changeset 1207 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks

Timestamp:

11/26/13 11:56:07 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• Job.java (modified) (1 diff)
• Task.java (modified) (8 diffs)
• TaskInterface.java (modified) (2 diffs)
• phases/ResourceConsumption.java (modified) (2 diffs)
• phases/ResourceConsumptionProfile.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import org.qcg.broker.schemas.resreqs.types.TaskStatesName;
 
-import gridsim.dcworms.DCWormsTags;
 
 import java.io.StringWriter;

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

@@ -4 +4 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -22 +21 @@
 import org.qcg.broker.schemas.resreqs.ProcessesResourceRequirements;
 import org.qcg.broker.schemas.resreqs.Requirements;
-import org.qcg.broker.schemas.resreqs.ResourceConsumptionType;
 import org.qcg.broker.schemas.resreqs.TaskResourceRequirements;
 import org.qcg.broker.schemas.resreqs.TimePeriod;
@@ -31 +29 @@
 import schedframe.scheduling.WorkloadUnitHandler;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
-import schedframe.scheduling.tasks.phases.ResourceConsumption;
-import schedframe.scheduling.tasks.phases.ResourceConsumptionProfile;
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
 
@@ -75 +71 @@
         private long workloadLogWaitTime;
         
-        private ResourceConsumptionProfile resourceConsumptionProfile;
 
         public Task(org.qcg.broker.schemas.resreqs.Task task){
@@ -96 +91 @@
         }
 
-        private void preparePhases() {
-                LinkedList<ResourceConsumption> resourceConsumptionList = new LinkedList<ResourceConsumption>();
-                
-                if(task.getExecution() == null || task.getExecution().getResourceConsumptionProfile() == null){
-                        ResourceConsumption resConsumption = null;
-                        try {
-                                resConsumption = new ResourceConsumption(this.length, getComputingResourceRequirements());
-                        } catch (NoSuchFieldException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                        }
-                        resourceConsumptionList.add(resConsumption);
-                }
-                else{
-                        for(ResourceConsumptionType resConsumption: task.getExecution().getResourceConsumptionProfile().getResourceConsumption()){
-                                ResourceConsumption resourceConsumption = new ResourceConsumption(resConsumption);
-                                resourceConsumptionList.add(resourceConsumption);
-                        }
-                }
-                this.resourceConsumptionProfile = new ResourceConsumptionProfile(resourceConsumptionList);
-                
-        //      System.out.println("======"+task.getExecution().getExecutable().getApplication().getName());
-        }
+        
         
         public DateTime getExecutionStartTime() throws NoSuchFieldException {
@@ -310 +283 @@
         }
         
-        protected ComputingResourceBaseTypeItem[] getComputingResourceRequirements() throws NoSuchFieldException{
+        public ComputingResourceBaseTypeItem[] getComputingResourceRequirements() throws NoSuchFieldException{
                 
                 Requirements req = this.task.getRequirements();
@@ -450 +423 @@
         public void setLength(long length) {
                 this.length = length;
-                preparePhases();
         }
 
@@ -515 +487 @@
                 wuh.handleTask(this);
         }
-        
-        public ResourceConsumptionProfile getResourceConsumptionProfile(){
-                return resourceConsumptionProfile;
-        }
-        
+
         public String getApplicationName(){
                 try{

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

@@ -7 +7 @@
 
 import schedframe.DescriptionContainer;
-import schedframe.scheduling.tasks.phases.ResourceConsumptionProfile;
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
 
@@ -111 +110 @@
         public long getWorkloadLogWaitTime();
         
-        public ResourceConsumptionProfile getResourceConsumptionProfile();
+        //public ResourceConsumptionProfile getResourceConsumptionProfile();
         
         public String getApplicationName();

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/ResourceConsumption.java

@@ -9 +9 @@
 import org.qcg.broker.schemas.resreqs.ComputingResourceParameterType;
 import org.qcg.broker.schemas.resreqs.PhaseBehaviourType;
-import org.qcg.broker.schemas.resreqs.ReferenceType;
+import org.qcg.broker.schemas.resreqs.StringParameterType;
+
 import org.qcg.broker.schemas.resreqs.ResourceConsumptionType;
 
@@ -36 +37 @@
         if(resConsumptionType.getReferenceHardware() != null){
                 for (int i = 0; i < resConsumptionType.getReferenceHardware().getReference().length; i++){
-                        ReferenceType rt = resConsumptionType.getReferenceHardware().getReference(i);
-                        referenceHardware.put(rt.getName(), rt.getContent());
+                        StringParameterType spt = resConsumptionType.getReferenceHardware().getReference(i);
+                        referenceHardware.put(spt.getName(), spt.getContent());
                 }
         }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/ResourceConsumptionProfile.java

@@ -2 +2 @@
 
 import java.util.LinkedList;
-import java.util.List;
 
 public class ResourceConsumptionProfile {
         
         protected LinkedList<ResourceConsumption> resourceConsumptionList;
-        protected int currentPhase;
+        protected long usefulWork;
+        private int currentPhase;
         
         public ResourceConsumptionProfile() {
@@ -37 +37 @@
                 this.currentPhase = currentPhase;
         }
+
+        public long getUsefulWork() {
+                return usefulWork;
+        }
+
+        public void setUsefulWork(long usefulWork) {
+                this.usefulWork = usefulWork;
+        }
 }