Changeset 1392 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy

Timestamp:

06/23/14 16:57:26 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (5 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -353 +353 @@
                 
                 PEUnit peUnit = (PEUnit)choosenResources.get(StandardResourceUnitName.PE);
-                updateComputingResources(peUnit, EnergyEventType.TASK_STARTED, exec);
+                updateComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
                 
 
@@ -435 +435 @@
                 log.debug(execTask.getJobId() + "_" + execTask.getId() + " finished execution on " + new DateTime());
                 log.info(DCWormsConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad());
+                
+                updateComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
         }
         
@@ -702 +704 @@
         
         
-        public void saveExecutionHistory(Executable exec, double completionPercentage, double estimatedDuration){
+        private void saveExecutionHistory(Executable exec, double completionPercentage, double estimatedDuration){
 
                 ExecutionHistoryItem execHistoryItem = new ExecutionHistoryItem(new DateTime());
@@ -711 +713 @@
                 exec.addExecHistory(execHistoryItem);
                 
+        }
+        
+        public boolean allocateResources(Executable exec, Map<ResourceUnitName, ResourceUnit> choosenResources, boolean exclusive){
+                boolean allocationStatus = getAllocationManager().allocateResources(choosenResources, exclusive);
+                if(allocationStatus){
+                        ResourceHistoryItem resourceHistoryItem = new ResourceHistoryItem(choosenResources);
+                        exec.addAllocatedResources(resourceHistoryItem);
+                        saveResourceHistory(exec);
+                        return true;
+                }
+                return false;
+        }
+        
+        private void saveResourceHistory(Executable exec){
                 ProcessingElements pes = (ProcessingElements) exec.getAllocatedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
                 for (ComputingResource resource : pes) {
@@ -735 +751 @@
         }
         
-        public boolean allocateResources(Executable exec, Map<ResourceUnitName, ResourceUnit> choosenResources, boolean exclusive){
-                boolean allocationStatus = getAllocationManager().allocateResources(choosenResources, exclusive);
-                if(allocationStatus){
-                        ResourceHistoryItem resourceHistoryItem = new ResourceHistoryItem(choosenResources);
-                        exec.addAllocatedResources(resourceHistoryItem);
-                        return true;
-                }
-                return false;
-        }
 }