Changeset 1396 for DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java

Timestamp:

06/26/14 14:18:01 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java (modified) (20 diffs)

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

@@ -59 +59 @@
 import schedframe.ExecutablesList;
 import schedframe.SimulatedEnvironment;
-import schedframe.exceptions.ResourceException;
+import schedframe.resources.CustomResourceType;
 import schedframe.resources.ResourceType;
-import schedframe.resources.UserResourceType;
 import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.extensions.Extension;
 import schedframe.resources.computing.extensions.ExtensionList;
@@ -69 +67 @@
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
 import schedframe.resources.computing.profiles.energy.MeasurementHistory;
-import schedframe.resources.computing.profiles.energy.airthroughput.AirFlowValue;
+import schedframe.resources.computing.profiles.energy.airthroughput.AirflowValue;
 import schedframe.resources.computing.profiles.energy.power.PowerUsage;
 import schedframe.resources.computing.profiles.energy.thermal.TemperatureValue;
@@ -80 +78 @@
 import schedframe.resources.units.StandardResourceUnitName;
 import schedframe.scheduling.ExecutionHistoryItem;
-import schedframe.scheduling.ResourceHistoryItem;
+import schedframe.scheduling.ResourceItem;
 import schedframe.scheduling.Scheduler;
 import schedframe.scheduling.manager.tasks.JobRegistry;
@@ -91 +89 @@
 import simulator.GenericUser;
 import simulator.stats.CoolEmAllMetricsCalculator;
+import simulator.stats.DCwormsAccumulator;
 import simulator.stats.DCwormsMetricsCalculator;
-import simulator.stats.GSSAccumulator;
 import simulator.stats.MetricsCalculator;
 import simulator.stats.SimulationStatistics;
@@ -124 +122 @@
         protected static final String RESOURCEUTILIZATION_STATISTICS_OUTPUT_FILE_NAME = "ResourceUtilization.txt";
         protected static final String ENERGYUSAGE_STATISTICS_OUTPUT_FILE_NAME = "EnergyUsage.txt";
-        protected static final String AIRFLOW_STATISTICS_OUTPUT_FILE_NAME = "AirThroughput.txt";
+        protected static final String AIRFLOW_STATISTICS_OUTPUT_FILE_NAME = "Airflow.txt";
         protected static final String TEMPERATURE_STATISTICS_OUTPUT_FILE_NAME = "Temperature.txt";
         protected static final String USEFUL_WORK_STATISTICS_OUTPUT_FILE_NAME = "UsefulWork.txt";
@@ -144 +142 @@
 
         protected GSSAccumulatorsStats accStats;
-        protected Map<String, GSSAccumulator> statsData;
+        protected Map<String, DCwormsAccumulator> statsData;
         
         protected GenericUser users;
@@ -232 +230 @@
                 task_processorsMap = new HashMap<String, Set<ComputingResource>>();
                 accStats = new GSSAccumulatorsStats();
-                statsData = new HashMap<String, GSSAccumulator>();
+                statsData = new HashMap<String, DCwormsAccumulator>();
                 
                 this.serializer = new StringSerializer();               
@@ -298 +296 @@
                                 cStats.add(Stats.chartEnergy);
                         cStats.add(Stats.textAirFlow);
-                        if(ArrayUtils.contains(configuration.resForAirFlowChart, resourceTypeName))
+                        if(ArrayUtils.contains(configuration.resForAirflowChart, resourceTypeName))
                                 cStats.add(Stats.chartAirFlow);
                         cStats.add(Stats.textTemperature);
@@ -420 +418 @@
                 List<ComputingResource> compResources = null;
                 for(String resourceTypeName: resourceController.getComputingResourceLayers()){
-                        GSSAccumulator resourceEnergyAccumulator = new GSSAccumulator();
-                        GSSAccumulator maxResourceEnergyAccumulator = new GSSAccumulator();
-                        GSSAccumulator calculationsEnergyAccumulator = new GSSAccumulator();
+                        DCwormsAccumulator resourceEnergyAccumulator = new DCwormsAccumulator();
+                        DCwormsAccumulator maxResourceEnergyAccumulator = new DCwormsAccumulator();
+                        DCwormsAccumulator calculationsEnergyAccumulator = new DCwormsAccumulator();
                         compResources = new ArrayList<ComputingResource>();
                         for(ComputingResource compRes: resourceController.getComputingResources() ){
-                                compResources.addAll(compRes.getDescendantsByType(new UserResourceType(resourceTypeName)));
+                                compResources.addAll(compRes.getDescendantsByType(new CustomResourceType(resourceTypeName)));
                         }
                         if(resourceController.getComputingResources().get(0).getType().getName().equals(resourceTypeName))
@@ -526 +524 @@
                                                 
                                                 for(Device device: compResource.getResourceCharacteristic().getDevices()){
-                                                        GSSAccumulator devAccumulator = new GSSAccumulator();
+                                                        DCwormsAccumulator devAccumulator = new DCwormsAccumulator();
                                                         ResourcePowerStats deviceEnergyUsage = gatherResourcePowerConsumptionStats(device);
                                                         deviceEnergyUsage.setMeanValue(calculateMeanValue(deviceEnergyUsage));
@@ -592 +590 @@
                                                         }
                                                         
-                                                        if(ArrayUtils.contains(configuration.resForAirFlowChart, device.getType().getName())){
+                                                        if(ArrayUtils.contains(configuration.resForAirflowChart, device.getType().getName())){
                                                                 if (configuration.creatediagrams_resairflow) {
                                                                         createResourceAirFlowDiagramData(deviceAirFlow);
@@ -767 +765 @@
 
 
-                        LinkedList<ResourceHistoryItem> resourceHistory = exec.getAllocatedResources();
+                        LinkedList<ResourceItem> resourceHistory = exec.getAllocatedResources();
                         if(resourceHistory.size() == 0)
                                 continue;
@@ -805 +803 @@
 
                                         try{
-                                                double usefulWork = execTask.getResourceConsumptionProfile().getUsefulWork()/pes.size();
+                                                double usefulWork = execTask.getExecutionProfile().getUsefulWork()/pes.size();
                                                 //double usefulWork = gatherUsefulWorkStats(pe).getValue();
-                                                GSSAccumulator uwAcc;
+                                                DCwormsAccumulator uwAcc;
                                                 if(metCalc.getMetricsData().containsKey("UW_" + pe.getFullName())){
                                                         uwAcc = metCalc.getMetricsData().get("UW_" + pe.getFullName()).get(0);
                                                         uwAcc.add(usefulWork);
                                                 } else {
-                                                        uwAcc = new GSSAccumulator();
+                                                        uwAcc = new DCwormsAccumulator();
                                                         uwAcc.add(usefulWork);
                                                         metCalc.addMetricsData("UW_" + pe.getFullName(), uwAcc);
@@ -832 +830 @@
                         Executable exec = (Executable) execTask;
 
-                        LinkedList<ResourceHistoryItem> resourceHistory = exec.getAllocatedResources();
+                        LinkedList<ResourceItem> resourceHistory = exec.getAllocatedResources();
                         if(resourceHistory.size() == 0)
                                 continue;
 
                         for(int i = 0; i < resourceHistory .size(); i++){
-                                ResourceHistoryItem resHistItem = resourceHistory.get(i);
+                                ResourceItem resHistItem = resourceHistory.get(i);
                                 Map<ResourceUnitName, ResourceUnit> res = resHistItem.getResourceUnits();
                                 ResourceUnit resUnit = res.get(StandardResourceUnitName.PE);
                                 //ProcessingElements pes = (ProcessingElements) resUnit ;
-                                LinkedList<ExecutionHistoryItem> execHistory = exec.getExecHistory();
+                                LinkedList<ExecutionHistoryItem> execHistory = exec.getExecutionHistory();
                                 long st = -1, et;
                                 for(int j = 0; j < execHistory .size(); j++){
@@ -893 +891 @@
 
                                                                 try{
-                                                                        double usefulWork = execTask.getResourceConsumptionProfile().getUsefulWork()/pes.size();
+                                                                        double usefulWork = execTask.getExecutionProfile().getUsefulWork()/pes.size();
                                                                         usefulWork = ((et - st) / (1000 * getExecutionTime(execTask))) * usefulWork;
-                                                                        GSSAccumulator uwAcc;
+                                                                        DCwormsAccumulator uwAcc;
                                                                         if(metCalc.getMetricsData().containsKey("UW_" + pe.getFullName())){
                                                                                 uwAcc = metCalc.getMetricsData().get("UW_" + pe.getFullName()).get(0);
                                                                                 uwAcc.add(usefulWork);
                                                                         } else {
-                                                                                uwAcc = new GSSAccumulator();
+                                                                                uwAcc = new DCwormsAccumulator();
                                                                                 uwAcc.add(usefulWork);
                                                                                 metCalc.addMetricsData("UW_" + pe.getFullName(), uwAcc);
@@ -922 +920 @@
                 long previousTimestamp = 0;
                 int previousStatus = DCWormsTags.CREATED;
-                for(ExecutionHistoryItem execHistItem: execTask.getExecHistory()){
+                for(ExecutionHistoryItem execHistItem: execTask.getExecutionHistory()){
                         if(previousStatus == DCWormsTags.INEXEC){
                                 executionTime = executionTime  + (execHistItem.getTimeStamp().getMillis()/1000 - previousTimestamp);
@@ -1033 +1031 @@
                 JobRegistry jr = new JobRegistryImpl(compResource.getFullName());
                 for(ExecTask task: jr.getFinishedTasks()){
-                        usefulWork = usefulWork + task.getResourceConsumptionProfile().getUsefulWork();
+                        usefulWork = usefulWork + task.getExecutionProfile().getUsefulWork();
                 }
                 ResourceUsefulWorkStats usefulWorkStats = new ResourceUsefulWorkStats(compResource.getFullName(), compResource.getType(), usageType, usefulWork, endSimulationTime);
@@ -1175 +1173 @@
                                         if(ee.getAirFlowProfile() == null)
                                                 break;
-                                        List<AirFlowValue> airFlowHistory = ee.getAirFlowProfile().getAirThroughputHistory();
+                                        List<AirflowValue> airFlowHistory = ee.getAirFlowProfile().getAirflowHistory();
                                         if(airFlowHistory.size() == 0)
                                                 break;
                                         long endSimulationTime = DateTimeUtilsExt.currentTimeMillis();
-                                        airFlowHistory.add(new AirFlowValue(endSimulationTime, ee.getAirFlowProfile().getAirThroughputHistory().get(ee.getAirFlowProfile().getAirThroughputHistory().size()-1).getValue()));
-                                        for(AirFlowValue af:airFlowHistory){
+                                        airFlowHistory.add(new AirflowValue(endSimulationTime, ee.getAirFlowProfile().getAirflowHistory().get(ee.getAirFlowProfile().getAirflowHistory().size()-1).getValue()));
+                                        for(AirflowValue af:airFlowHistory){
                                                 airFlow.put(af.getTimestamp(), af.getValue());
                                         }
@@ -1402 +1400 @@
                                 resourceAirFlowDiagram = getResourceDynamicDiagram(resourceAirFlowDiagrams.get(resType), simulationTime, chartName,
                                                 subtitle, axisName);
-                                if (!saveXYPlotChart(resourceAirFlowDiagram, fileName + "AirThroughput_" + resType))
+                                if (!saveXYPlotChart(resourceAirFlowDiagram, fileName + "Airflow_" + resType))
                                         return false;
                         }
@@ -2040 +2038 @@
         }
 
-        public GSSAccumulator getStats(String name) {
+        public DCwormsAccumulator getStats(String name) {
                 return statsData.get(name);
         }