Changeset 1374 for DCWoRMS/branches

Timestamp:

06/05/14 15:24:38 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src

Files:

• gridsim/dcworms/DCWormsTags.java (modified) (1 diff)
• schedframe/resources/computing/ComputingResource.java (modified) (1 diff)
• schedframe/resources/computing/profiles/energy/power/ui/ComputingResourcePowerInterface.java (modified) (3 diffs)
• schedframe/scheduling/manager/resources/LocalResourceManager.java (modified) (2 diffs)
• schedframe/scheduling/manager/resources/ResourceManager.java (modified) (1 diff)
• schedframe/scheduling/manager/tasks/AbstractJobRegistry.java (modified) (5 diffs)
• schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (3 diffs)
• schedframe/scheduling/tasks/Job.java (modified) (3 diffs)
• simulator/reader/ResourceReader.java (modified) (1 diff)
• simulator/stats/implementation/DCWormsStatistics.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/gridsim/dcworms/DCWormsTags.java

@@ -57 +57 @@
     public static final int NEW_EXEC_PHASE = 5;
     
-    public static final int PAUSED = 6;
+    public static final int PAUSING = 6;
+    
+    public static final int PAUSED = 7;
 
-    public static final int RESUMED = 7;
+    public static final int RESUMING = 8;
     
-    public static final int SUCCESS = 8;
+    public static final int RESUMED = 9;
+    
+    public static final int IN_MIGRATION = 10;
+    
+    public static final int SUCCESS = 11;
 
-    public static final int CANCELED = 9;
+    public static final int CANCELED = 12;
 
-    public static final int FAILED = 10;
+    public static final int FAILED = 13;
+    
+
 }

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

@@ -158 +158 @@
         }
 
-        public ComputingResource getDescendantByName(String resourceName) throws ResourceException {
+        public ComputingResource getDescendantByName(String resourceName){
                 List<ResourceValidator> validators = new ArrayList<ResourceValidator>();
                 validators.add(new ResourceNameValidator(resourceName));

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/ComputingResourcePowerInterface.java

@@ -64 +64 @@
         }
 
-        public List<PowerState> getSupportedPowerStates() throws NoSuchFieldException {
+        public List<PowerState> getSupportedPowerStates(){
                 List<PowerState> powerStates = new ArrayList<PowerState>();
                 for(PowerState powerState: powerProfile.getSupportedPowerStates()){
@@ -74 +74 @@
         public boolean supportPowerState(PowerStateName state) {
                 for(PowerState powerState: powerProfile.getSupportedPowerStates()){
-                        if(powerState.getName().equals(state)){
+                        if(powerState.getName().getName().equals(state.getName())){
                                 return true;
                         }
@@ -86 +86 @@
                 if(supportPowerState(state)){
                         for(PowerState powerState: powerProfile.getSupportedPowerStates()){
-                                if(powerState.getName().equals(state)){
+                                if(powerState.getName().getName().equals(state.getName())){
                                         powerConsumption = powerState.getPowerUsage();
                                         break;

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

@@ -134 +134 @@
         }
 
-        public ComputingResource getResourceByName(String resourceName) throws ResourceException {
+        public ComputingResource getResourceByName(String resourceName) {
                 ComputingResource resourceWithName = null;
                 for (int i = 0; i < computingResources.size() && resourceWithName == null; i++) {
@@ -269 +269 @@
                                 resourceWithName = resource;
                         else
-                                try {
-                                        resourceWithName = resource.getDescendantByName(resName);
-                                } catch (ResourceException e) {
-                                        return null;
-                                }
+                                resourceWithName = resource.getDescendantByName(resName);
+
                 }
                 if(resourceWithName == null)

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

@@ -19 +19 @@
         public List<? extends ComputingResource> getResourcesOfType(ResourceType type) throws ResourceException;
 
-        public ComputingResource getResourceByName(String resourceName) throws ResourceException;
+        public ComputingResource getResourceByName(String resourceName);
 
         public List<? extends ComputingResource> getResourcesByTypeWithStatus(ResourceType type, ResourceStatus status) throws ResourceException;

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/AbstractJobRegistry.java

@@ -11 +11 @@
 import schedframe.resources.units.ResourceUnit;
 import schedframe.resources.units.ResourceUnitName;
+import schedframe.scheduling.manager.resources.utils.ResourceManagerUtils;
 import schedframe.scheduling.tasks.Job;
 import schedframe.scheduling.tasks.JobInterface;
@@ -65 +66 @@
         public List<JobInterface<?>> getJobs(){
                 List<JobInterface<?>> jobList = new ArrayList<JobInterface<?>>();
-                for(String jobId:jobs.keySet()) {
+                for(String jobId: jobs.keySet()) {
                         jobList.add(jobs.get(jobId));
                 }
@@ -74 +75 @@
                 List<JobInterface<?>> jobList = new ArrayList<JobInterface<?>>();
                 synchronized (jobs) {
-                        for(String jobId:jobs.keySet()){
+                        for(String jobId: jobs.keySet()){
                                 JobInterface<?> job = jobs.get(jobId);
                                 if (job.getStatus() == status) {
@@ -90 +91 @@
                         return false;
                 }else{
+                        try {
+                                execTask.setStatus(DCWormsTags.PAUSING);
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
                         String[] ids = new String[2];
                         ids[0] = new String(jobId);
@@ -116 +123 @@
                         return false;
                 }else{
+                        try {
+                                execTask.setStatus(DCWormsTags.IN_MIGRATION);
+                        } catch (Exception e) {
+                                return false;
+                        }
+                        if(choosenResources != null){
+                                ResourceManagerUtils.setPendingResources(choosenResources);
+                        }
                         Object[] data = new Object[3];
                         data[0] = new String(jobId);

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

@@ -213 +213 @@
                         if (pluginSupportsEvent(tag)) {
                                 SchedulingEvent event = new SchedulingEvent(SchedulingEventType.POWER_LIMIT_EXCEEDED);
+                                String source;
+                                try{
+                                        source = ev.get_data().toString();
+                                } catch(Exception e){
+                                        source = null;
+                                }
+                                event.setSource(source);
                                 SchedulingPlanInterface<?> decision = schedulingPlugin.schedule(event,
                                                 queues,  getJobRegistry(), getResourceManager(), moduleList);
@@ -412 +419 @@
                 getAllocationManager().freeResources(lastUsed);
                 
+                //TODO calculate the value of completion
                 saveExecutionHistory(exec, 100,0);
                 
@@ -556 +564 @@
                 LocalResourceManager resourceManager = getResourceManager();
                 if(resourceName != null){
-                        ComputingResource resource = null;
-                        try {
-                                resource = resourceManager.getResourceByName(resourceName);
-                        } catch (ResourceException e) {
+                        ComputingResource resource = resourceManager.getResourceByName(resourceName);
+                        if(resource == null){
                                 return null;
                         }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/tasks/Job.java

@@ -229 +229 @@
                         if(w.getAnd() != null) {
                                 parCnt = w.getAnd().getParentOpTypeItemCount();
-                                if(parCnt == 0)
-                                {
+                                if(parCnt == 0){
                                         availableTasks.add(task);
-                                }
-                                else
+                                }else
                                 {
                                         for(int j = 0; j < parCnt; j++){
@@ -251 +249 @@
                         else if(w.getOr() != null) {
                                 parCnt = w.getOr().getParentOpTypeItemCount();
-                                if(parCnt == 0)
-                                {
+                                if(parCnt == 0){
                                         availableTasks.add(task);
                                 }
-                                else
-                                {
+                                else{
                                         for(int j = 0; j < parCnt; j++){
                                                 ParentType par = w.getOr().getParentOpTypeItem(j).getParent();
@@ -273 +269 @@
                         else {
                                 parCnt = w.getParentCount();
-                                if(parCnt == 0)
-                                {
+                                if(parCnt == 0){
                                         availableTasks.add(task);
-                                }
-                                else
-                                {
+                                }else{
                                         for(int j = 0; j < parCnt; j++){
                                                 ParentType par = w.getParent(j);

DCWoRMS/branches/coolemall/src/simulator/reader/ResourceReader.java

@@ -376 +376 @@
                         for(String resourceName : resIdList){
                                 ComputingResource computingResource;
-                                try {
-                                        if(mainCompRes.getFullName().contains(resourceName))
-                                                computingResource = mainCompRes;
-                                        else
-                                                computingResource = mainCompRes.getDescendantByName(resourceName);
-                                } catch (ResourceException e) {
-                                        continue;
-                                }
+
+                                if(mainCompRes.getFullName().contains(resourceName))
+                                        computingResource = mainCompRes;
+                                else
+                                        computingResource = mainCompRes.getDescendantByName(resourceName);
+
                                 if(computingResource != null)
                                 {

DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -955 +955 @@
                 int cnt = 0;
                 for(String resName: basicStats.keySet()){
-                        try {
-                                if(resource.getDescendantByName(resName) != null || resource.getFullName().compareTo(resName) == 0){
-                                        createResourceLoadData(usageStats, basicStats.get(resName));
-                                        cnt++;
-                                }
-                        } catch (ResourceException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
+
+                        if(resource.getDescendantByName(resName) != null || resource.getFullName().compareTo(resName) == 0){
+                                createResourceLoadData(usageStats, basicStats.get(resName));
+                                cnt++;
                         }
                 }
@@ -1593 +1589 @@
                 for(String resName: peLoad.keySet()){
 
-                        try {
-                                if(resource.getDescendantByName(resName) != null || resource.getFullName().compareTo(resName) == 0){
-                                        Double load = peLoad.get(resName);
-                                        sum += load;
-                                        peCnt++;
-                                }
-                        } catch (ResourceException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
+                        if(resource.getDescendantByName(resName) != null || resource.getFullName().compareTo(resName) == 0){
+                                Double load = peLoad.get(resName);
+                                sum += load;
+                                peCnt++;
                         }
                 }