Changeset 1415 for DCWoRMS/branches/coolemall/src/dcworms/schedframe

Timestamp:

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

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/Executable.java (modified) (12 diffs)

DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/Executable.java

@@ -30 +30 @@
 import schedframe.scheduling.tasks.AbstractProcessesGroup;
 import schedframe.scheduling.tasks.Task;
-import schedframe.scheduling.tasks.phases.ResourceConsumption;
+import schedframe.scheduling.tasks.phases.ExecutionPhase;
 import schedframe.scheduling.tasks.phases.ExecutionProfile;
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
@@ -48 +48 @@
         
         protected String reservationId;
-        protected double completionPercentage;
+        protected double completionPercentageTotal;
         
         protected int estimatedDuration;
@@ -64 +64 @@
         protected ExecutionProfile execProfile;
         
-        protected LinkedList<ExecutionHistoryItem> execHistory;;
+        protected LinkedList<ExecutionHistoryItem> execHistory;
         protected LinkedList<ResourceItem> allocatedResources;
         
@@ -187 +187 @@
                 
                 if (newStatus == DCWormsTags.SUCCESS || newStatus == DCWormsTags.CANCELED) {
-            finishTime = DateTimeUtilsExt.currentTimeMillis() / 1000;
+            finishTime = currentTime;
         }
                 
@@ -196 +196 @@
         if ((prevStatus == DCWormsTags.INEXEC) && (status == DCWormsTags.CANCELED || status == DCWormsTags.PAUSED ||
                 status == DCWormsTags.SUCCESS)){
-                totalCompletionTime += (currentTime -  execStartTime);
-                execStartTime = execStartTimeFirst;
+            totalCompletionTime += (currentTime -  execStartTime);
+            execStartTime = execStartTimeFirst;
         }
 
@@ -218 +218 @@
         if(status == DCWormsTags.NEW_EXEC_PHASE && prevStatus == DCWormsTags.INEXEC){
                 status = DCWormsTags.INEXEC;
-                completionPercentage = 0;
+                execProfile.setCompletionPercentage(0.0);
                 execProfile.setCurrentPhase(execProfile.getCurrentPhase() + 1);
         }
@@ -255 +255 @@
         }
         
-        public double getCompletionPercentage() {
-                return completionPercentage;
-        }
-
-        public void setCompletionPercentage(double completionPercentage) {
-                this.completionPercentage = completionPercentage;
+        public double getTotalCompletionPercentage() {
+                return completionPercentageTotal;
+        }
+
+        public void setTotalCompletionPercentage(double completionPercentage) {
+                this.completionPercentageTotal = completionPercentage;
         }
 
@@ -370 +370 @@
         }
 
-        public ResourceConsumption getCurrentResourceConsumption(){
-                return execProfile.getCurrentResourceConsumption();
-        }
-        
         public String getApplicationName(){
                 return task.getApplicationName();
@@ -379 +375 @@
         
         private void preparePhases(String resourceType) {
-                LinkedList<ResourceConsumption> resourceConsumptionList = new LinkedList<ResourceConsumption>();
+                LinkedList<ExecutionPhase> resourceConsumptionList = new LinkedList<ExecutionPhase>();
                 
                 long usefulWork = -1;
@@ -385 +381 @@
                 if(task.getDescription().getExecution() == null || task.getDescription().getExecution().getResourceConsumptionProfile() == null
                                 || task.getDescription().getExecution().getResourceConsumptionProfile().length == 0 ){
-                        ResourceConsumption resConsumption = null;
+                        ExecutionPhase resConsumption = null;
                         try {
-                                resConsumption = new ResourceConsumption(getLength(), task.getComputingResourceRequirements());
+                                resConsumption = new ExecutionPhase(getLength(), task.getComputingResourceRequirements());
                         } catch (NoSuchFieldException e) {
                                 // TODO Auto-generated catch block
@@ -399 +395 @@
                                         if(resConsumptioProfile.getType() != null && resConsumptioProfile.getType().equals(resourceType)){
                                                 for(ResourceConsumptionType resConsumption: resConsumptioProfile.getResourceConsumption()){
-                                                        ResourceConsumption resourceConsumption = new ResourceConsumption(resConsumption);
+                                                        ExecutionPhase resourceConsumption = new ExecutionPhase(resConsumption);
                                                         resourceConsumptionList.add(resourceConsumption);
                                                 }
@@ -415 +411 @@
                         if(!found){
                                 for(ResourceConsumptionType resConsumption: task.getDescription().getExecution().getResourceConsumptionProfile()[0].getResourceConsumption()){
-                                        ResourceConsumption resourceConsumption = new ResourceConsumption(resConsumption);
+                                        ExecutionPhase resourceConsumption = new ExecutionPhase(resConsumption);
                                         resourceConsumptionList.add(resourceConsumption);
                                 }