Changeset 1357 for DCWoRMS/branches

Timestamp:

04/23/14 14:35:44 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src

Files:

• schedframe/scheduling/policy/global/GlobalManagementSystem.java (modified) (1 diff)
• schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (4 diffs)
• simulator/stats/implementation/DCWormsStatistics.java (modified) (1 diff)
• simulator/workload/WorkloadLoader.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/global/GlobalManagementSystem.java

@@ -250 +250 @@
         }
 
-        class GlobalWorkloadUnitHandler implements  WorkloadUnitHandler{
+        class GlobalWorkloadUnitHandler implements WorkloadUnitHandler{
 
                 public void handleJob(JobInterface<?> job){

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

@@ -256 +256 @@
                 
                 PEUnit peUnit = (PEUnit)choosenResources.get(StandardResourceUnitName.PE);
-                notifyComputingResources(peUnit, EnergyEventType.TASK_STARTED, exec);
+                updateComputingResources(peUnit, EnergyEventType.TASK_STARTED, exec);
                 
                 updateTaskExecution(exec, SchedulingEventType.START_TASK_EXECUTION);
@@ -311 +311 @@
                 
                 PEUnit peUnit = (PEUnit)lastUsed.get(StandardResourceUnitName.PE);
-                notifyComputingResources(peUnit, EnergyEventType.TASK_FINISHED, exec);
+                updateComputingResources(peUnit, EnergyEventType.TASK_FINISHED, exec);
         }
         
@@ -342 +342 @@
         }
         
-        private void notifyComputingResources(PEUnit peUnit, EnergyEventType eventType, Object obj){
+        private void updateComputingResources(PEUnit peUnit, EnergyEventType eventType, Object obj){
                 if(peUnit instanceof ProcessingElements){
                         ProcessingElements pes = (ProcessingElements) peUnit;
@@ -427 +427 @@
                                 scheduler.sendInternal(phaseDuration, DCWormsTags.TASK_EXECUTION_FINISHED, execTask);
                                 PEUnit peUnit = (PEUnit)exec.getUsedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
-                                notifyComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
+                                updateComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
                         } else {
                                 scheduler.sendInternal(phaseDuration, DCWormsTags.TASK_EXECUTION_CHANGED, execTask);
                                 PEUnit peUnit = (PEUnit)exec.getUsedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
-                                notifyComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
+                                updateComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
                         }
                 }

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

@@ -862 +862 @@
         }
         
+        private ResourceUsageStats gatherResourceOccupancyStatsNew(ComputingResource resource, Map<String, List<ResStat>> basicStats) {
+
+                String usageType = null;
+                if(resource.getResourceCharacteristic().getParameters().get("load-sensor")!= null){
+                        usageType = resource.getResourceCharacteristic().getParameters().get("load-sensor").get(0).getContent();
+                }
+                ResourceUsageStats usageStats = new ResourceUsageStats(resource.getFullName(), resource.getType(), usageType);
+                int cnt = 0;
+                
+                ResourceType resType = null;
+
+                for(String key: basicStats.keySet()){
+                        List<ResStat> resStats = basicStats.get(key);
+                        resType = resStats.get(0).getResType();
+                        break;
+                }
+                List<ComputingResource> resources = null;
+                try {
+                        resources = new ArrayList<ComputingResource>();
+                        for(ComputingResource compRes: resourceController.getComputingResources()){
+                                resources.addAll(compRes.getDescendantsByType(resType));
+                        }
+                } catch (Exception e) {
+
+                }
+                
+                List<String> resourcesNames = new ArrayList<String>(resources.size());
+                for(ComputingResource compRes: resources){
+                        resourcesNames.add(compRes.getFullName());
+                }
+                
+                
+                for(String resName: basicStats.keySet()){
+                                if( resourcesNames.contains(resName)  || resource.getFullName().compareTo(resName) == 0){
+                                        createResourceLoadData(usageStats, basicStats.get(resName));
+                                        cnt++;
+                                }
+                }
+                for(Long key: usageStats.getHistory().keySet()){
+                        Double value = usageStats.getHistory().get(key)/cnt;
+                        usageStats.getHistory().put(key, value);
+                }
+                return usageStats;
+        }
+
         private ResourceAvailabilityStats gatherResourceAvailabilityStats(ComputingResource resource) {
                 String usageType = new String ("usedNodes");

DCWoRMS/branches/coolemall/src/simulator/workload/WorkloadLoader.java

@@ -9 +9 @@
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -70 +71 @@
                 this.generatedJobsCnt = 0;
                 this.generatedTasksCnt = 0;
-                this.jobsMap = new TreeMap<String, JobDescription>();
+                this.jobsMap = new LinkedHashMap<String, JobDescription>();
                 this.appProfilesFolder = appProfilesFolder;
                 this.applicationProfiles = new TreeMap<String, ApplicationProfileDescription>();