Changeset 517 for DCWoRMS/trunk/src

Timestamp:

10/16/12 09:38:14 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe

Files:

• resources/computing/ComputingResource.java (modified) (2 diffs)
• scheduling/manager/resources/LocalResourceManager.java (modified) (2 diffs)
• scheduling/manager/resources/ResourceManager.java (modified) (1 diff)
• scheduling/plugin/local/ResourceAllocation.java (moved) (moved from DCWoRMS/trunk/src/schedframe/scheduling/plugin/local/ResourceAllocationInterface.java) (2 diffs)
• scheduling/policy/AbstractManagementSystem.java (modified) (2 diffs)

DCWoRMS/trunk/src/schedframe/resources/computing/ComputingResource.java

@@ -237 +237 @@
         
         public PowerInterface getPowerInterface(){
+                Extension extension = getExtension(ExtensionType.ENERGY_EXTENSION);
+                if(extension != null){
+                        EnergyExtension ee = (EnergyExtension)extension;
+                        return ee.getPowerInterface();
+                }
+                return null;
+        }
+        
+        public AirThroughputInterface getAirThroughputInterface(){
+                Extension extension = getExtension(ExtensionType.ENERGY_EXTENSION);
+                if(extension != null){
+                        EnergyExtension ee = (EnergyExtension)extension;
+                        return ee.getAirThroughputInterface();
+                }
+                return null;
+        }
+
+        private  Extension getExtension(ExtensionType type){
                 if (extensionList != null) {
                         for (Extension extension : extensionList) {
-                                if (extension.getType() == ExtensionType.ENERGY_EXTENSION) {
-                                        EnergyExtension ee = (EnergyExtension)extension;
-                                        return ee.getPowerInterface();
+                                if (extension.getType() == type) {
+                                        return extension;
                                 }
                         }
@@ -248 +265 @@
         }
         
-        public AirThroughputInterface getAirThroughputInterface(){
-                if (extensionList != null) {
-                        for (Extension extension : extensionList) {
-                                if (extension.getType() == ExtensionType.ENERGY_EXTENSION) {
-                                        EnergyExtension ee = (EnergyExtension)extension;
-                                        return ee.getAirThroughputInterface();
-                                }
-                        }
-                }
-                return null;
-        }
-
         public Scheduler getScheduler() {
                 return scheduler;

DCWoRMS/trunk/src/schedframe/scheduling/manager/resources/LocalResourceManager.java

@@ -29 +29 @@
 import schedframe.resources.units.StandardResourceUnitName;
 import schedframe.scheduling.Scheduler;
-import schedframe.scheduling.plugin.local.ResourceAllocationInterface;
-
-
-public class LocalResourceManager implements ResourceAllocationInterface, ResourceManager {
+import schedframe.scheduling.plugin.local.ResourceAllocation;
+
+
+public class LocalResourceManager implements ResourceAllocation, ResourceManager {
 
         //private Log log = LogFactory.getLog(ResourceManager.class);
@@ -38 +38 @@
         protected List<ComputingResource> computingResources;
         protected List<Scheduler> schedulers;
-        //protected ResourceCharacteristics resourceCharacteristic;
         protected Map<ResourceUnitName, List<ResourceUnit>> resourceUnits;
 

DCWoRMS/trunk/src/schedframe/scheduling/manager/resources/ResourceManager.java

@@ -22 +22 @@
 
         public List<? extends ComputingResource> getResourcesByTypeWithStatus(ResourceType type, ResourceStatus status) throws ResourceException;
-
-        //public ResourceCharacteristics getResourceCharacteristic();
         
         public Map<ResourceUnitName, List<ResourceUnit>> getSharedResourceUnits();

DCWoRMS/trunk/src/schedframe/scheduling/plugin/local/ResourceAllocation.java

@@ -6 +6 @@
 import schedframe.resources.units.ResourceUnitName;
 
-public interface ResourceAllocationInterface {
+public interface ResourceAllocation {
         
         /**
@@ -25 +25 @@
         public void freeResources(Map<ResourceUnitName, ResourceUnit> lastUsedResources);
         
-        //public void allocateProcessors(Map<ResourceParameterName, ResourceUnit> freeRes);
-        
-
-        //public void clearPendingProcessors(List<Resource> choosenResources);
-        
-
 }

DCWoRMS/trunk/src/schedframe/scheduling/policy/AbstractManagementSystem.java

@@ -26 +26 @@
 import schedframe.scheduling.plugin.estimation.ExecutionTimeEstimationPlugin;
 import schedframe.scheduling.plugin.grid.ModuleList;
-import schedframe.scheduling.plugin.local.ResourceAllocationInterface;
+import schedframe.scheduling.plugin.local.ResourceAllocation;
 import schedframe.scheduling.queue.TaskQueue;
 import schedframe.scheduling.queue.TaskQueueList;
@@ -104 +104 @@
         }
 
-        public ResourceAllocationInterface getAllocationManager() {
-                if (resourceManager instanceof ResourceAllocationInterface)
-                        return (ResourceAllocationInterface) resourceManager;
+        public ResourceAllocation getAllocationManager() {
+                if (resourceManager instanceof ResourceAllocation)
+                        return (ResourceAllocation) resourceManager;
                 else
                         return null;