Changeset 896 for DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/Executable.java

Timestamp:

03/04/13 08:25:34 (12 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -25 +25 @@
 import schedframe.scheduling.tasks.AbstractProcessesGroup;
 import schedframe.scheduling.tasks.Task;
+import schedframe.scheduling.tasks.phases.ResourceConsumption;
 import schedframe.scheduling.tasks.phases.ResourceConsumptionProfile;
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
@@ -39 +40 @@
         
         protected int status; 
-        protected double length;
         protected Map<ResourceParameterName, Object> specificResources;
         
@@ -158 +158 @@
         }
 
-        if (newStatus < DCWormsTags.CREATED || newStatus > DCWormsTags.FAILED_RESOURCE_UNAVAILABLE) {
+        if (newStatus < DCWormsTags.CREATED || newStatus > DCWormsTags.NEW_EXEC_PHASE) {
             throw new Exception("Executable.setStatuts() : Error - " +
                     "Invalid integer range for Execiutable status.");
@@ -204 +204 @@
                 }
         }
+        
+        if(status == DCWormsTags.NEW_EXEC_PHASE){
+                if(prevStatus == DCWormsTags.INEXEC){
+                        status = DCWormsTags.INEXEC;
+                        setCompletionPercentage(0);
+                        task.getResourceConsumptionProfile().setCurrentPhase(task.getResourceConsumptionProfile().getCurrentPhase() + 1);
+                        
+                        DateTime currentDateTime = new DateTime();
+                        
+                        if(getUsedResources().getLast().getTimeStamp().getMillis() == currentDateTime.getMillis()){
+                                return;
+                        }
+                        ResourceHistoryItem resHistItem = new ResourceHistoryItem(getUsedResources().getLast().getResourceUnits(), currentDateTime);
+                        addUsedResources(resHistItem);
+                }
+        }
         }
         
@@ -209 +225 @@
                 if(this.specificResources == null)
                         this.specificResources = new HashMap<ResourceParameterName, Object>();
-                
                 this.specificResources.put(resourceName, value);
         }
@@ -216 +231 @@
                 if(this.specificResources == null)
                         return false;
-
                 return this.specificResources.containsKey(resourceName);
         }
@@ -255 +269 @@
         }
         
-    public void setSchedulerName(int resourceId)
-    {
+    public void setSchedulerName(int resourceId){
         this.schedName = GridSim.getEntityName(resourceId);
     }
 
-    public String getSchedulerName()
-    {
+    public String getSchedulerName(){
         return schedName;
     }
@@ -368 +380 @@
         }
 
-        private int currentPhase = 0;
-
-        public int getCurrentPhase() {
-                return currentPhase;
-        }
-
-        public void setCurrentPhase(int currentPhase) {
-                this.currentPhase = currentPhase;
+        public ResourceConsumption getCurrentResourceConsumption(){
+                return task.getResourceConsumptionProfile().getCurrentResourceConsumption();
         }