Changeset 539 for DCWoRMS/trunk/build/classes/simulator/stats/implementation

Timestamp:

10/31/12 13:52:06 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/build/classes/simulator/stats/implementation

Files:

• DCWormsStatistics$1.class (added)
• DCWormsStatistics$JobIdComparator.class (added)
• DCWormsStatistics$MapPEIdComparator.class (added)
• DCWormsStatistics.class (added)
• DCWormsStatistics.java (added)
• GSSAccumulatorsStats.class (modified) (previous)
• GSSAccumulatorsStats.java (modified) (2 diffs)
• ResStat.class (modified) (previous)
• ResourceAirFlowStats.class (added)
• ResourceAirFlowStats.java (added)
• ResourceDynamicStats.class (added)
• ResourceDynamicStats.java (added)
• ResourcePowerStats.class (added)
• ResourcePowerStats.java (added)
• ResourceUsageStats.class (modified) (previous)
• ResourceUsageStats.java (modified) (2 diffs)
• Stats.class (modified) (previous)
• TaskStats.class (modified) (previous)
• TaskStats.java (modified) (2 diffs)
• out/StatsSerializer.class (modified) (previous)
• out/StatsSerializer.java (modified) (2 diffs)
• out/StringSerializer.class (modified) (previous)
• out/StringSerializer.java (modified) (5 diffs)

DCWoRMS/trunk/build/classes/simulator/stats/implementation/GSSAccumulatorsStats.java

@@ -10 +10 @@
         public GSSAccumulator meanQueueLength;
         public GSSAccumulator meanEnergyUsage;
+        public GSSAccumulator meanAirFlow;
 
         public GSSAccumulator meanTaskStartTime;
@@ -29 +30 @@
                 meanReservationLoad = new GSSAccumulator();
                 meanQueueLength = new GSSAccumulator();
-                meanEnergyUsage = new GSSAccumulator();
+                meanEnergyUsage = new GSSAccumulator(); 
+                meanAirFlow = new GSSAccumulator(); 
 
                 meanTaskStartTime = new GSSAccumulator();

DCWoRMS/trunk/build/classes/simulator/stats/implementation/ResourceUsageStats.java

@@ -1 +1 @@
 package simulator.stats.implementation;
 
-import java.util.Map;
-import java.util.TreeMap;
-
 import schedframe.resources.ResourceType;
-import schedframe.resources.StandardResourceType;
 import simulator.stats.implementation.out.StatsSerializer;
 
-/**
- * 
- * @author Marcin Krystek
- * 
- */
-public class ResourceUsageStats implements StatsInterface {
+public class ResourceUsageStats extends ResourceDynamicStats implements StatsInterface {
 
-        protected Map<Long, Integer> usage;
-        protected String resourceName;
-        protected String usageType;
-        protected ResourceType resourceType;
-        protected double meanUsage;
-        
-        public void setMeanUsage(double meanUsage) {
-                this.meanUsage = meanUsage;
-        }
-
-        private String[] headers = { "resourceName", "timestamp", "usage" };
+        private String[] headers = { "resourceName", "timestamp", "utilization" };
 
         public ResourceUsageStats(String resourceName, ResourceType resourceType, String usageType) {
-                this.resourceName = resourceName;
-                this.resourceType = resourceType;
-                this.usageType = usageType;
-                this.usage = new TreeMap<Long, Integer>();
-                this.meanUsage = 0;
-        }
-
-        public double getMeanUsage() {
-                return meanUsage;
-        }
-
-        public String getResourceName() {
-                return this.resourceName;
-        }
-        
-        public ResourceType getResourceType() {
-                return resourceType;
-        }
-        
-        public String getUsageType() {
-                return this.usageType;
-        }       
-
-        public Map<Long, Integer> getUsage() {
-                return this.usage;
+                super(resourceName, resourceType, usageType);
         }
 
@@ -62 +19 @@
                 return headers;
         }
-
 }

DCWoRMS/trunk/build/classes/simulator/stats/implementation/TaskStats.java

@@ -1 +1 @@
 package simulator.stats.implementation;
 
-import gssim.schedframe.scheduling.Executable;
 
 import java.util.List;
+
+import dcworms.schedframe.scheduling.Executable;
 
 import simulator.stats.implementation.out.StatsSerializer;
@@ -45 +46 @@
 
         public String getUserDN() {
-                return this.task.getUserDn();
+                return this.task.getUserDN();
         }
 
         public String getResName() {
-                String resNames[] = this.task.getAllResourceName();
-                String resName = "";
-                for (int i = 0; i < resNames.length; i++) {
-                        resName += resNames[i];
-                        if (resNames.length > 1)
-                                resName += " ";
-                }
+                String resName = this.task.getSchedulerName();
+
                 return resName;
         }

DCWoRMS/trunk/build/classes/simulator/stats/implementation/out/StatsSerializer.java

@@ -4 +4 @@
 import simulator.stats.implementation.GSSAccumulatorsStats;
 import simulator.stats.implementation.JobStats;
-import simulator.stats.implementation.ResourceEnergyStats;
+import simulator.stats.implementation.ResourceAirFlowStats;
+import simulator.stats.implementation.ResourcePowerStats;
 import simulator.stats.implementation.ResourceStats;
 import simulator.stats.implementation.ResourceUsageStats;
@@ -26 +27 @@
         public Object visit(ResourceUsageStats arg);
         
-        public Object visit(ResourceEnergyStats arg);
+        public Object visit(ResourcePowerStats arg);
 
+        public Object visit(ResourceAirFlowStats arg);
         
         public Object visit(GSSAccumulatorsStats arg);

DCWoRMS/trunk/build/classes/simulator/stats/implementation/out/StringSerializer.java

@@ -11 +11 @@
 import simulator.stats.implementation.GSSAccumulatorsStats;
 import simulator.stats.implementation.JobStats;
-import simulator.stats.implementation.ResourceEnergyStats;
+import simulator.stats.implementation.ResourceAirFlowStats;
+import simulator.stats.implementation.ResourcePowerStats;
 import simulator.stats.implementation.ResourceStats;
 import simulator.stats.implementation.ResourceUsageStats;
@@ -258 +259 @@
 
         public Object visit(ResourceUsageStats resourceUsageStats) {
-                Map<Long, Integer> resourceUsage = resourceUsageStats.getUsage();
+                Map<Long, Double> resourceUsage = resourceUsageStats.getHistory();
                 
                 int mapSize = resourceUsage.size();
@@ -297 +298 @@
                         buffer.append(resourceUsageStats.getResourceName());
                         buffer.append(fieldSeparator);
-                        Integer value = resourceUsage.get(timestamp);
+                        Double value = resourceUsage.get(timestamp);
                         buffer.append(timestamp);
                         buffer.append(fieldSeparator);
@@ -306 +307 @@
 
                 }
-
-                buffer.append("mean: " + resourceUsageStats.getMeanUsage());
-                buffer.append(System.getProperty("line.separator"));
-                return buffer.toString();
-        }
-
-        public Object visit(ResourceEnergyStats resourceEnergyStats) {
-                Map<Long, Double> resourceEnergy = resourceEnergyStats.getEnergy();
+                if(resourceUsage.size() > 0){
+                        buffer.append("mean: " + resourceUsageStats.getMeanValue());
+                        buffer.append(System.getProperty("line.separator"));    
+                }
+                return buffer.toString();
+        }
+
+        public Object visit(ResourcePowerStats resourceEnergyStats) {
+                Map<Long, Double> resourceEnergy = resourceEnergyStats.getHistory();
                 
                 int mapSize = resourceEnergy.size();
@@ -361 +363 @@
 
                 }
-                buffer.append("mean: "+resourceEnergyStats.getMeanUsage() + " sum: " +resourceEnergyStats.getSumUsage());
-                buffer.append(System.getProperty("line.separator"));
+                
+                if(resourceEnergy.size() > 0) {
+                        buffer.append("mean: "+resourceEnergyStats.getMeanValue() + " sum: " +resourceEnergyStats.getSumValue());
+                        buffer.append(System.getProperty("line.separator"));    
+                }
+
+                return buffer.toString();
+        }
+
+        public Object visit(ResourceAirFlowStats resourceAirFlowStats) {
+                Map<Long, Double> resourceAirFlow = resourceAirFlowStats.getHistory();
+                
+                int mapSize = resourceAirFlow.size();
+                /*
+                 * FIXME:
+                 * Integer.MAX_VALUE = 2147483647. We assume, that each line contains 
+                 * max 30 signs - this gives max 71582788 lines. If resourceUsage map
+                 * contains more elements then we have a problem, because content of
+                 * resourceUsage map will not fit in the buffer.
+                 * This will need further attention in the future.
+                 */
+                int maxSize = (Integer.MAX_VALUE / 30 ) - 1;
+                if(mapSize >= maxSize){
+                        log.error("Resource usage data is to long to fit in the buffer.");
+                        return null;
+                }
+                
+                int size = 30 * resourceAirFlow.size();
+                
+                StringBuffer buffer = null;
+
+                if(printedHeaders.add(resourceAirFlowStats.getUsageType())) {
+                        buffer = new StringBuffer(size + 42);
+                        String[] headers = resourceAirFlowStats.getHeaders();
+                        for(int i = 0; i < headers.length; i++)
+                        {
+                                buffer.append(headers[i]);
+                                buffer.append(fieldSeparator);
+                        }
+                        buffer.append(System.getProperty("line.separator"));
+                } else {
+                        buffer = new StringBuffer(size);
+                }
+                
+                
+                for (Long timestamp : resourceAirFlow.keySet()) {
+                        
+                        buffer.append(resourceAirFlowStats.getResourceName());
+                        buffer.append(fieldSeparator);
+                        Double value = resourceAirFlow.get(timestamp);
+                        buffer.append(timestamp);
+                        buffer.append(fieldSeparator);
+                        buffer.append(DataCenterWorkloadSimulator.DFAULT_NUMBER_FORMAT
+                                        .format(value));
+                        buffer.append(fieldSeparator);
+                        buffer.append(System.getProperty("line.separator"));
+
+                }
+                
+                if(resourceAirFlow.size() > 0) {
+                        buffer.append("mean: "+resourceAirFlowStats.getMeanValue() + " sum: " +resourceAirFlowStats.getSumValue());
+                        buffer.append(System.getProperty("line.separator"));    
+                }
 
                 return buffer.toString();