Changeset 1330 for DCWoRMS/branches

Timestamp:

03/31/14 17:12:50 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingResource.java (modified) (4 diffs)

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

@@ -3 +3 @@
 import gridsim.GridSimTags;
 import gridsim.dcworms.DCWormsTags;
-import gridsim.dcworms.filter.ResourceEventFilter;
 
 import java.util.ArrayList;
@@ -14 +13 @@
 import schedframe.events.ResourceEventCommand;
 import schedframe.events.scheduling.EventReason;
+import schedframe.events.scheduling.ResourceStateChangedEvent;
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.events.scheduling.SchedulingEventCommand;
@@ -74 +74 @@
         public void setParent(ComputingResource newParent) {
                 parent = newParent;
-                if(this.getLoadInterface().getLoadCalendar().getLoadDistribution().size() == 0){
+                /*if(this.getLoadInterface().getLoadCalendar().getLoadDistribution().size() == 0){
                         this.getLoadInterface().getLoadCalendar().getLoadDistribution().addAll(parent.getLoadInterface().getLoadCalendar().getLoadDistribution());
-                }
+                }*/
         }
 
@@ -254 +254 @@
                                 //ResourceEventFilter filter = new ResourceEventFilter(src.hashCode(), DCWormsTags.UPDATE_PROCESSING);
                                 //scheduler.sim_cancel(filter, null);
-                                scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
+                                ResourceStateChangedEvent rscEvent = (ResourceStateChangedEvent) event;
+                                EnergyEventType eeType = (EnergyEventType)rscEvent.getEventType();
+                                scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.RESOURCE_STATE_CHANGED, src);
+                                switch(eeType){
+                                
+                                        case FREQUENCY_CHANGED: {
+                                                scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE_PROCESSING, src);
+                                                break;
+                                        }
+                                }
+
                         } else if(parent != null)
                                 parent.getEventHandler().handleSchedulingEvent(event);