Changeset 1392 for DCWoRMS/branches

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe

Files:

• resources/computing/ComputingResource.java (modified) (3 diffs)
• resources/units/ProcessingElements.java (modified) (3 diffs)
• scheduling/manager/resources/LocalResourceManager.java (modified) (1 diff)
• scheduling/policy/local/LocalManagementSystem.java (modified) (5 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingResource.java

@@ -16 +16 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.events.scheduling.SchedulingEventCommand;
-import schedframe.exceptions.ResourceException;
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.ResourceType;
@@ -256 +255 @@
                                 ResourceStateChangedEvent rscEvent = (ResourceStateChangedEvent) event;
                                 EnergyEventType eeType = (EnergyEventType)rscEvent.getEventType();
-                                scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.RESOURCE_STATE_CHANGED, src);
+                                //scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
                                 switch(eeType){
                                 
+                                        case RESOURCE_UTILIZATION_CHANGED: {
+                                                scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
+                                                break;
+                                        }
                                         case FREQUENCY_CHANGED: {
                                                 scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
@@ -310 +313 @@
         }
 
-
 }

DCWoRMS/branches/coolemall/src/schedframe/resources/units/ProcessingElements.java

@@ -10 +10 @@
 import schedframe.resources.ResourceType;
 import schedframe.resources.computing.ComputingResource;
+import schedframe.scheduling.manager.tasks.JobRegistryImpl;
 
 public class ProcessingElements extends PEUnit implements List<ComputingResource> {
@@ -215 +216 @@
                 //allocate resources
                 if(delta > 0){
-                                for(int i = 0; i < this.resources.size() && delta > 0; i++){
-                                        ComputingResource r = this.resources.get(i);
-                                        if(r.getStatus() == ResourceStatus.FREE || r.getStatus() == ResourceStatus.PENDING){
-                                                r.setStatus(ResourceStatus.BUSY);
-                                                delta--;
-                                        }
+                        for(int i = 0; i < this.resources.size() && delta > 0; i++){
+                                ComputingResource r = this.resources.get(i);
+                                if(r.getStatus() == ResourceStatus.FREE || r.getStatus() == ResourceStatus.PENDING){
+                                        r.setStatus(ResourceStatus.BUSY);
+                                        delta--;
                                 }
+                        }
                 }
                 //free resources
@@ -228 +229 @@
                                 ComputingResource r = this.resources.get(i);
                                 if(r.getStatus() == ResourceStatus.BUSY){
-                                        r.setStatus(ResourceStatus.FREE);
-                                        delta++;
+                                        if(new JobRegistryImpl(r.getFullName()).getRunningTasks().size() == 0){
+                                                r.setStatus(ResourceStatus.FREE);
+                                                delta++;        
+                                        }
                                 }
                         }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/LocalResourceManager.java

@@ -310 +310 @@
                                         for(ComputingResource cr: pe){
                                                 if(cr.getStatus().equals(ResourceStatus.BUSY)){
+                                                        freeResources(resources, true);
                                                         return false;
                                                 }

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;
-        }
 }