Changeset 490 for DCWoRMS/trunk/src/schedframe/scheduling/manager

Timestamp:

10/09/12 13:58:06 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/scheduling/manager

Files:

• resources/LocalResourceManager.java (modified) (7 diffs)
• tasks/JobRegistry.java (modified) (1 diff)
• tasks/JobRegistryImpl.java (modified) (3 diffs)

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

@@ -13 +13 @@
 import java.util.Properties;
 import java.util.Set;
-import java.util.Stack;
 
 import schedframe.exceptions.ResourceException;
@@ -175 +174 @@
                 return resourceUnit;
         }
-        /*public List<AbstractResourceUnit> getAvailableResourceUnits(String resourceName) throws Exception {
-                ComputingResource resource = getResourceByName(resourceName);
-                List<AbstractResourceUnit> resourceUnits = new ArrayList<AbstractResourceUnit>();
-                while(resource != null){
-                        for(List<AbstractResourceUnit> resUnits: resource.getResourceCharacteristic().getResourceUnits().values())
-                                resUnits.addAll(resourceUnits);
-                        resource = resource.getParent();
-                }
-                
-                return resourceUnits;
-        }*/
 
         public List<? extends ComputingResource> filterResources(Properties properties) {
@@ -242 +230 @@
                                 computingResources = (List<ComputingResource>) getResourcesOfType(StandardResourceType.Core);
                         } catch (ResourceException e) {
-                                throw new RuntimeException("GSSIM internal error");
+                                throw new RuntimeException("DCWorms internal error");
                         }
                         PEUnit peUnit = new ProcessingElements(computingResources);
@@ -253 +241 @@
                                 computingResources = (List<ComputingResource>) getResourcesOfType(StandardResourceType.Processor);
                         } catch (ResourceException e) {
-                                throw new RuntimeException("GSSIM internal error");
+                                throw new RuntimeException("DCWorms internal error");
                         }
                         PEUnit peUnit = new ProcessingElements(computingResources);
@@ -318 +306 @@
                         return false;
                 }
-                /*ResourceUnit peUnit = resources.get(StandardResourceUnitName.PE);
-
-                if (peUnit != null) {
-                        if (peUnit instanceof ProcessingElements) {
-                                ProcessingElements choosenProcessors = (ProcessingElements) peUnit;
-
-                                for (int i = 0; i < choosenProcessors.size(); i++) {
-                                        choosenProcessors.get(i).setStatus(ResourceStatus.BUSY);
-                                }
-                        }
-                }*/
-
-                /*Memory m = (Memory) resources.get(StandardResourceUnitName.MEMORY);
-                if (m != null) {
-                        m.getProvisioner().setState(ResourceUnitState.BUSY);
-                }*/
                 
                 for(ResourceUnitName resUnitName: resources.keySet()){
@@ -345 +317 @@
         public void freeResources(Map<ResourceUnitName, ResourceUnit> resources) {
                 
-                /*ResourceUnit peUnit = resources.get(StandardResourceUnitName.PE);
-                
-                if (peUnit instanceof ProcessingElements) {
-                        ProcessingElements processingElements = (ProcessingElements) peUnit;
-
-                        for (int i = 0; i < processingElements.size(); i++) {
-                                processingElements.get(i).setStatus(ResourceStatus.FREE);
-                        }
-                }*/
-
-                /*Memory m = (Memory) resources.get(StandardResourceUnitName.MEMORY);
-                if (m != null) {
-                        m.getProvisioner().setState(ResourceUnitState.FREE);
-                }*/
-                
                 for(ResourceUnitName resUnitName: resources.keySet()){
                         ResourceUnit resUnit = resources.get(resUnitName);
@@ -366 +323 @@
         }
 
-
 }

DCWoRMS/trunk/src/schedframe/scheduling/manager/tasks/JobRegistry.java

@@ -1 +1 @@
 package schedframe.scheduling.manager.tasks;
 
-import gssim.schedframe.scheduling.ExecTask;
 
 import java.util.List;
+
+import dcworms.schedframe.scheduling.ExecTask;
 
 import schedframe.ExecutablesList;

DCWoRMS/trunk/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java

@@ -2 +2 @@
 
 import gridsim.gssim.DCWormsTags;
-import gssim.schedframe.scheduling.ExecTask;
 
 import java.util.ArrayList;
@@ -12 +11 @@
 import org.qcg.broker.schemas.resreqs.ParentType;
 import org.qcg.broker.schemas.resreqs.types.TaskStatesName;
+
+import dcworms.schedframe.scheduling.ExecTask;
 
 import qcg.shared.constants.BrokerConstants;
@@ -82 +83 @@
                 synchronized (executables)  {
                         for (ExecTask task : executables) {
-                                if (task.getJobId().compareTo(jobId) == 0 && task.getId().compareTo(taskId)==0) {
+                                if (task.getJobId().compareTo(jobId) == 0 && task.getId().compareTo(taskId) == 0) {
                                         return task;
                                 }