Changeset 1392 for DCWoRMS/branches/coolemall/src/schedframe/resources

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources

Files:

• computing/ComputingResource.java (modified) (3 diffs)
• units/ProcessingElements.java (modified) (3 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++;        
+                                        }
                                 }
                         }