Changeset 1423 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingResource.java

Timestamp:

07/30/14 12:25:00 (11 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -47 +47 @@
         //protected ResourceCharacteristics resourceCharacteristic;
 
-
+        
         public ComputingResource(ComputingResourceDescription resDesc) {
                 this.type = resDesc.getType();
@@ -53 +53 @@
                 this.category = resDesc.getCategory();
                 this.status = ResourceStatus.FREE;
-                this.extensionList = new ExtensionListImpl(1);
+                this.extensionList = new ExtensionListImpl(2);
                 initCharacteristics(resDesc);
                 accept(new LoadExtension(resDesc.getLoadProfile(), this));
                 accept(new EnergyExtension.Builder().resource(this).powerProfile(resDesc.getPowerProfile()).airflowProfile(resDesc.getAirflowProfile()).thermalProfile(resDesc.getThermalProfile()).build());   
+
         }
 
         protected void initCharacteristics(ComputingResourceDescription resDesc){
-                resourceCharacteristic = ComputingResourceCharacteristics.builder().resourceUnits(resDesc.getResourceUnits()).location(resDesc.getLocation()).parameters(resDesc.getParameters()).device(resDesc.getDevices()).build();
+                this.resourceCharacteristic = ComputingResourceCharacteristics.builder().resourceUnits(resDesc.getResourceUnits()).location(resDesc.getLocation()).parameters(resDesc.getParameters()).device(resDesc.getDevices()).build();
                 for(Device device: ((ComputingResourceCharacteristics)resourceCharacteristic).getDevices()){
                         device.setComputingResource(this);
@@ -71 +72 @@
 
         public void setParent(ComputingResource newParent) {
-                parent = newParent;
+                this.parent = newParent;
                 /*if(this.getLoadInterface().getLoadCalendar().getLoadDistribution().size() == 0){
                         this.getLoadInterface().getLoadCalendar().getLoadDistribution().addAll(parent.getLoadInterface().getLoadCalendar().getLoadDistribution());
@@ -79 +80 @@
         public List<ComputingResource> getChildren() {
                 if (children == null)
-                        return new ArrayList<ComputingResource>(1);
+                        return new ArrayList<ComputingResource>(0);
                 return children;
         }
@@ -124 +125 @@
                 ResourceEventCommand rec = new ResourceEventCommand(this);
                 rec.execute(event);
-                SchedulingEventCommand sec = new SchedulingEventCommand(this);
-                sec.execute(event);
-
+                if((scheduler != null && (parent != null && scheduler != parent.getScheduler()))  && !event.getSource().equals(scheduler.getFullName())){
+                        SchedulingEventCommand sec = new SchedulingEventCommand(this);
+                        sec.execute(event);
+                }
                 //old, correctly working method
                 /*if (extensionList != null) {
@@ -143 +145 @@
         }
         
+
+        public void updateState(ResourceEvent event){
+                for (Device device: ((ComputingResourceCharacteristics)resourceCharacteristic).getDevices()) {
+                        for (Extension extension: device.getExtensionList()) {
+                                if (extension.supportsEvent(event)) {
+                                        extension.handleEvent(event);
+                                }
+                        }
+                }
+                
+                if (extensionList != null) {
+                        for (Extension extension: extensionList) {
+                                if (extension.supportsEvent(event)) {
+                                        extension.handleEvent(event);
+                                }
+                        }
+                }
+                
+        }
+        
         public List <? extends ComputingResource> getDescendantsByType(ResourceType type) {
-                List<ResourceValidator> validators = new ArrayList<ResourceValidator>();
+                List<ResourceValidator> validators = new ArrayList<ResourceValidator>(1);
                 validators.add(new ResourceTypeValidator(type));
                 return searchDescendants(validators, true);
@@ -150 +172 @@
 
         public List<? extends ComputingResource> getDescendantsByTypeAndStatus(ResourceType type, ResourceStatus status) {
-                List<ResourceValidator> validators = new ArrayList<ResourceValidator>();
+                List<ResourceValidator> validators = new ArrayList<ResourceValidator>(2);
                 validators.add(new ResourceStatusValidator(status));
                 validators.add(new ResourceTypeValidator(type));
@@ -157 +179 @@
 
         public ComputingResource getDescendantByName(String resourceName){
-                List<ResourceValidator> validators = new ArrayList<ResourceValidator>();
+                List<ResourceValidator> validators = new ArrayList<ResourceValidator>(1);
                 validators.add(new ResourceNameValidator(resourceName));
                 List<? extends ComputingResource> resources = searchDescendants(validators, true);
@@ -227 +249 @@
                 
                 public void handleResourceEvent(ResourceEvent event){
+                        for (Device device: ((ComputingResourceCharacteristics)resourceCharacteristic).getDevices()) {
+                                for (Extension extension: device.getExtensionList()) {
+                                        if (extension.supportsEvent(event)) {
+                                                extension.handleEvent(event);
+                                        }
+                                }
+                        }
+                        
                         if (extensionList != null) {
                                 for (Extension extension: extensionList) {
                                         if (extension.supportsEvent(event)) {
                                                 extension.handleEvent(event);
-                                        }
-                                }
-                                
-                                for (Device device: ((ComputingResourceCharacteristics)resourceCharacteristic).getDevices()) {
-                                        for (Extension extension: device.getExtensionList()) {
-                                                if (extension.supportsEvent(event)) {
-                                                        extension.handleEvent(event);
-                                                }
                                         }
                                 }