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

Timestamp:

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

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java (modified) (1 diff)

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");