Changeset 1377 for DCWoRMS/branches/coolemall/src/schedframe/scheduling

Timestamp:

06/06/14 10:48:32 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling

Files:

• manager/resources/LocalResourceManager.java (modified) (3 diffs)
• manager/resources/ResourceAllocation.java (modified) (1 diff)
• plugin/local/ResourceAllocation.java (deleted)
• policy/AbstractManagementSystem.java (modified) (1 diff)
• policy/local/LocalManagementSystem.java (modified) (5 diffs)

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

@@ -29 +29 @@
 import schedframe.resources.units.StandardResourceUnitName;
 import schedframe.scheduling.Scheduler;
-import schedframe.scheduling.plugin.local.ResourceAllocation;
 
 
@@ -297 +296 @@
         }
         
-        public boolean allocateResources(Map<ResourceUnitName, ResourceUnit> resources) {
+
+        public boolean allocateResources(Map<ResourceUnitName, ResourceUnit> resources, boolean exclusive) {
                 
                 if (resources == null) {
@@ -303 +303 @@
                 }
                 
-                for(ResourceUnitName resUnitName: resources.keySet()){
-                        ResourceUnit resUnit = resources.get(resUnitName);
-                        resUnit.getProvisioner().setState(ResourceUnitState.BUSY);
-                }
-                return true;
-        }
-
-
-        public void freeResources(Map<ResourceUnitName, ResourceUnit> resources) {
+                if(exclusive){
+                        for(ResourceUnitName resUnitName: resources.keySet()){
+                                ResourceUnit resUnit = resources.get(resUnitName);
+                                if(resUnit.getName().getName().equals(StandardResourceUnitName.PE.getName())){
+                                        ProcessingElements pe = (ProcessingElements)resUnit;
+                                        for(ComputingResource cr: pe){
+                                                if(cr.getStatus().equals(ResourceStatus.BUSY)){
+                                                        return false;
+                                                }
+                                        }
+                                }
+                                resUnit.getProvisioner().setState(ResourceUnitState.BUSY);
+                        }
+                        
+                        return true;
+                } else {
+                        for(ResourceUnitName resUnitName: resources.keySet()){
+                                ResourceUnit resUnit = resources.get(resUnitName);
+                                resUnit.getProvisioner().setState(ResourceUnitState.BUSY);
+                        }
+                        return true;    
+                }
+        }
+
+        public void freeResources(Map<ResourceUnitName, ResourceUnit> resources, boolean exclusive) {
                 
                 for(ResourceUnitName resUnitName: resources.keySet()){

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

@@ -1 +1 @@
 package schedframe.scheduling.manager.resources;
 
-import java.util.List;
+import java.util.Map;
 
-import schedframe.resources.computing.ComputingResource;
+import schedframe.resources.units.ResourceUnit;
+import schedframe.resources.units.ResourceUnitName;
 
 public interface ResourceAllocation {
-        public void allocateResources(List<ComputingResource> resources);
+        
+        /**
+         * Allocates resource units( marks as used) on the basis of given resource
+         * units.
+         * 
+         * @param freeRes
+         *            resource units to be consumed
+         * @param exclusive
+         *           allocate resources in exclusive mode
+         */
+        public boolean allocateResources(Map<ResourceUnitName, ResourceUnit> freeRes, boolean exclusive);
 
+        /**
+         * Frees given resource units.
+         * 
+         * @param lastUsedResources
+         *            resource units to be free
+         * @param exclusive
+         *            free resources allocated in exclusive mode
+         */
+        public void freeResources(Map<ResourceUnitName, ResourceUnit> lastUsedResources, boolean exclusive);
 
-        public void freeResources(List<ComputingResource> resources);
         
 }

DCWoRMS/branches/coolemall/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.ResourceAllocation;
+import schedframe.scheduling.manager.resources.ResourceAllocation;
 import schedframe.scheduling.queue.TaskQueue;
 import schedframe.scheduling.queue.TaskQueueList;

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -238 +238 @@
                                 Executable exec = (Executable) execTask;
                                 Map<ResourceUnitName, ResourceUnit> lastUsed = exec.getAllocatedResources().getLast().getResourceUnits();
-                                getAllocationManager().freeResources(lastUsed);
+                                getAllocationManager().freeResources(lastUsed, true);
                                 
                                 saveExecutionHistory(exec, exec.getCompletionPercentage(), exec.getEstimatedDuration());
@@ -262 +262 @@
                                 Executable exec = (Executable) execTask;
 
-                                boolean status = allocateResources(exec, resources);
+                                boolean status = allocateResources(exec, resources, true);
                                 if(status == false){
                                         TaskList newTasks = new TaskListImpl();
@@ -332 +332 @@
 
                 Executable exec = (Executable)task;
-                boolean allocationStatus = allocateResources(exec, choosenResources);
+                boolean allocationStatus = allocateResources(exec, choosenResources, false);
                 if(allocationStatus == false){
                         log.info("Task " + task.getJobId() + "_" + task.getId() + " requires more resources than is available at this moment.");
@@ -417 +417 @@
 
                 Map<ResourceUnitName, ResourceUnit> lastUsed = exec.getAllocatedResources().getLast().getResourceUnits();
-                getAllocationManager().freeResources(lastUsed);
+                getAllocationManager().freeResources(lastUsed, true);
                 
                 //TODO calculate the value of completion
@@ -727 +727 @@
         }
         
-        public boolean allocateResources(Executable exec, Map<ResourceUnitName, ResourceUnit> choosenResources){
-                boolean allocationStatus = getAllocationManager().allocateResources(choosenResources);
+        public boolean allocateResources(Executable exec, Map<ResourceUnitName, ResourceUnit> choosenResources, boolean exclusive){
+                boolean allocationStatus = getAllocationManager().allocateResources(choosenResources, exclusive);
                 if(allocationStatus){
                         ResourceHistoryItem resourceHistoryItem = new ResourceHistoryItem(choosenResources);