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

Timestamp:

07/15/14 16:26:31 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• ExecutionPhase.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/ResourceConsumption.java) (2 diffs)
• ExecutionProfile.java (modified) (2 diffs)
• PhaseSystemLoad.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/phases/PhaseBehaviour.java) (1 diff)

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

@@ -13 +13 @@
 import org.qcg.broker.schemas.resreqs.ResourceConsumptionType;
 
-public class ResourceConsumption {
+public class ExecutionPhase {
 
         protected String id;
     protected Map<String, String> referenceHardware;
-    protected long duration;
-    protected List<PhaseBehaviour> phaseBehaviourList;
+    protected long originDuration;
+    protected long lenght;
+    protected List<PhaseSystemLoad> systemLoad;
     
-    public ResourceConsumption(long duration, ComputingResourceBaseTypeItem item[]){
+    public ExecutionPhase(long duration, ComputingResourceBaseTypeItem item[]){
         this.id = null;
         this.referenceHardware = null;
-        this.duration = duration;
-        this.phaseBehaviourList = new ArrayList<PhaseBehaviour>();
+        this.originDuration = duration;
+        this.systemLoad = new ArrayList<PhaseSystemLoad>();
         for(ComputingResourceBaseTypeItem compResItem: item){
                 ComputingResourceParameterType hostParameter = compResItem.getHostParameter();
-                PhaseBehaviour pb = new PhaseBehaviour(hostParameter.getName().toString());
-                phaseBehaviourList.add(pb);
+                PhaseSystemLoad pb = new PhaseSystemLoad(hostParameter.getName().toString());
+                systemLoad.add(pb);
         }
+        this.lenght = duration;
     }
     
-    public ResourceConsumption(ResourceConsumptionType resConsumptionType){
+    public ExecutionPhase(ResourceConsumptionType resConsumptionType){
         this.id = resConsumptionType.getId();
         this.referenceHardware = new HashMap<String, String>();
+        this.originDuration = resConsumptionType.getDuration().toLong() / 1000;
+        
+        double speed = 1;
         if(resConsumptionType.getReferenceHardware() != null){
                 for (int i = 0; i < resConsumptionType.getReferenceHardware().getReference().length; i++){
                         StringParameterType spt = resConsumptionType.getReferenceHardware().getReference(i);
-                        referenceHardware.put(spt.getName(), spt.getContent());
+                        this.referenceHardware.put(spt.getName(), spt.getContent());
+                if(spt.getName().equals("cpu_maxfreq")){
+                        speed = new Double(spt.getContent());
+                }
                 }
         }
-        this.duration = resConsumptionType.getDuration().toLong()/1000;
-        this.phaseBehaviourList = new ArrayList<PhaseBehaviour>();
+        this.systemLoad = new ArrayList<PhaseSystemLoad>();
+        int nrOfThreads = 1;
         for(PhaseBehaviourType pbt: resConsumptionType.getBehaviour()){
-                PhaseBehaviour pb = new PhaseBehaviour(pbt);
-                phaseBehaviourList.add(pb);
+                PhaseSystemLoad pb = new PhaseSystemLoad(pbt);
+                this.systemLoad.add(pb);
+                if(pbt.getName().equals("PM_Threads")){
+                        nrOfThreads = new Double(pbt.getParameterTypeChoice().getParameterTypeChoiceItem(0).getParameterValue().getContent()).intValue();
+                }
         }
+        this.lenght = (long) (originDuration * nrOfThreads * speed);
     }
     
@@ -62 +74 @@
 
         public long getDuration() {
-                return duration;
+                return originDuration;
         }
 
-        public List<PhaseBehaviour> getBehaviourList() {
-                return phaseBehaviourList;
+        public List<PhaseSystemLoad> getSystemLoad() {
+                return systemLoad;
+        }
+
+        public long getLenght() {
+                return lenght;
         }
 

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

@@ -5 +5 @@
 public class ExecutionProfile {
         
-        protected LinkedList<ResourceConsumption> resourceConsumptionList;
+        protected LinkedList<ExecutionPhase> resourceConsumptionList;
         protected long usefulWork;
+        protected double completionPercentage;
         private int currentPhase;
+        
 
-        public ExecutionProfile(LinkedList<ResourceConsumption> resourceConsumptionList) {
+        public ExecutionProfile(LinkedList<ExecutionPhase> resourceConsumptionList) {
                 this.resourceConsumptionList = resourceConsumptionList;
+                this.completionPercentage = 0;
                 this.currentPhase = 0;
         }
         
-        public LinkedList<ResourceConsumption> getResourceConsumptionList(){
+        public LinkedList<ExecutionPhase> getResourceConsumptionList(){
                 return resourceConsumptionList;
         }
         
-        public ResourceConsumption getCurrentResourceConsumption(){
+        public ExecutionPhase getCurrentResourceConsumption(){
                 return resourceConsumptionList.get(currentPhase);
         }
@@ -44 +47 @@
                 return false;
         }
+
+        public double getCompletionPercentage() {
+                return completionPercentage;
+        }
+
+        public void setCompletionPercentage(double completionPercentage) {
+                this.completionPercentage = completionPercentage;
+        }
+        
+        public long getLength() {
+                long length = 0;
+                for(ExecutionPhase execPhase: resourceConsumptionList){
+                        length = length + execPhase.getLenght();
+                }
+                return length;
+        }
 }

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

@@ -3 +3 @@
 import org.qcg.broker.schemas.resreqs.PhaseBehaviourType;
 
-public class PhaseBehaviour {
+public class PhaseSystemLoad {
         
         protected String resName;
         protected double utilization;
         
-        PhaseBehaviour(String resName, double utilization) {
+        PhaseSystemLoad(String resName, double utilization) {
                 this.resName = resName;
                 this.utilization = utilization;
         }
         
-        PhaseBehaviour(String resName) {
+        PhaseSystemLoad(String resName) {
                 this.resName = resName;
                 this.utilization = 100;
         }
         
-        PhaseBehaviour(PhaseBehaviourType pbt) {
+        PhaseSystemLoad(PhaseBehaviourType pbt) {
                 this.resName = pbt.getName();
                 this.utilization = pbt.getParameterTypeChoice().getParameterTypeChoiceItem(0).getParameterValue().getContent();