Changeset 1597 for DCWoRMS/branches

Timestamp:

11/28/16 14:30:31 (8 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -420 +420 @@
                         DCwormsAccumulator maxResourceEnergyAccumulator = new DCwormsAccumulator();
                         DCwormsAccumulator calculationsEnergyAccumulator = new DCwormsAccumulator();
+                        //DCwormsAccumulator tempAboveThresholdAccumulator = new DCwormsAccumulator();
+                        //DCwormsAccumulator tempAboveThresholdAccumulatorH = new DCwormsAccumulator();
                         List<ComputingResource> compResources = new ArrayList<ComputingResource>();
                         for(ComputingResource compRes: resourceController.getComputingResources() ){
@@ -613 +615 @@
                                                 temperature.setMeanValue(calculateMeanValue(temperature));
                                                 temperature.setSumValue(temperature.getMeanValue() * (endSimulationTime - startSimulationTime) / (3600 * MILLI_SEC));
-                                                
+                                                /*if(resourceTypeName.equals("Processor")){
+                                                        tempAboveThresholdAccumulator.add(calculateTempExcTime(temperature));
+                                                        tempAboveThresholdAccumulatorH.add(calculateTempExcTimeH(temperature));                                                 
+                                                }*/
                                                 EnergyExtension een = (EnergyExtension)(compResource.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
                                                 if(resourceController.getComputingResources().contains(compResource)) {
@@ -684 +689 @@
                                 metCalc.addMetricsData(resourceTypeName, resourceEnergyAccumulator);
                                 metCalc.addMetricsData(resourceTypeName + "_MAX", maxResourceEnergyAccumulator);
+                                /*if(resourceTypeName.equals("Processor")){
+                                        metCalc.addMetricsData(resourceTypeName + "_TEMPEXC", tempAboveThresholdAccumulator);
+                                        metCalc.addMetricsData(resourceTypeName + "_TEMPHEXC", tempAboveThresholdAccumulatorH);                                 
+                                }*/
                         }
                 }
@@ -737 +746 @@
         }
 
+        
+        /*private double calculateTempExcTime(ResourceTemperatureStats temperature) {
+                double overall = 0;
+                long prevt = 0;
+                //double prevTemp;
+                boolean exceeded = false;
+                for(Long t: temperature.getHistory().keySet()){
+                        if(exceeded){
+                                overall = overall + (t - prevt);
+                                exceeded = false;
+                        }
+                        double temp = temperature.getHistory().get(t);
+                        if(temp > EnvironmentConditions.i5_statsTThres){
+                                prevt = t;
+                                exceeded = true;
+                                //prevTemp = temp;
+                        }
+                }
+                return overall;
+        }
+        private double calculateTempExcTimeH(ResourceTemperatureStats temperature) {
+                double overall = 0;
+                long prevt = 0;
+                //double prevTemp;
+                boolean exceeded = false;
+                for(Long t: temperature.getHistory().keySet()){
+                        if(exceeded){
+                                overall = overall + (t - prevt);
+                                exceeded = false;
+                        }
+                        double temp = temperature.getHistory().get(t);
+                        if(temp > EnvironmentConditions.i5_statsTThresH){
+                                prevt = t;
+                                exceeded = true;
+                                //prevTemp = temp;
+                        }
+                }
+                return overall;
+        }*/
         
         private void peStatsPostProcessing(Map<ComputingResource, List<ResStat>> basicResStats){
@@ -1099 +1147 @@
                                         long endSimulationTime = DateTimeUtilsExt.currentTimeMillis();
 
-                                        loadHistory.add(new MeasurementHistory(endSimulationTime, le.getLoadProfile().getUtilizationHistory().get(le.getLoadProfile().getUtilizationHistory().size() - 1).getValue()/100));
+                                        loadHistory.add(new MeasurementHistory(endSimulationTime, le.getLoadProfile().getUtilizationHistory().get(le.getLoadProfile().getUtilizationHistory().size() - 1).getValue()));
                                         for(MeasurementHistory l:loadHistory){
                                                 usage.put(l.getTimestamp(), l.getValue()/100);