Changeset 1005 for DCWoRMS/branches

Timestamp:

03/25/13 08:49:36 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src

Files:

• schedframe/resources/computing/ComputingResource.java (modified) (1 diff)
• schedframe/scheduling/manager/resources/ResourceManagerFactory.java (modified) (1 diff)
• simulator/stats/implementation/DCWormsStatistics.java (modified) (4 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingResource.java

@@ -117 +117 @@
         
         public String getFullName() {
+                if(this.getResourceCharacteristic().getParameters().get("fullPath") != null){
+                        String fullPath = this.getResourceCharacteristic().getParameters().get("fullPath").get(0).getContent();
+                        return fullPath;
+                }
                 if(parent!= null){
                         return parent.getFullName() + "/" + name;

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ResourceManagerFactory.java

@@ -10 +10 @@
                 ManagedComputingResources managedResource = scheduler.getCompResources();
                 
-                if(managedResource.getType().getName().equals("DataCenter"))
+                if(managedResources == null || managedResource.getType().getName().equals("DataCenter"))
                         return new GridResourceDiscovery(scheduler);
                 else if (managedResource.getType().getName().equals("Rack"))

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

@@ -562 +562 @@
         
         private ResourceUsageStats gatherResourceLoadStats(ComputingResource resource, Map<String, List<ResStat>> basicStats) {
-                ResourceUsageStats usageStats = new ResourceUsageStats(resource.getName(), resource.getType(), "resourceLoadStats");
+                ResourceUsageStats usageStats = new ResourceUsageStats(resource.getFullName(), resource.getType(), "resourceLoadStats");
                 int cnt = 0;
                 for(String resName: basicStats.keySet()){
@@ -635 +635 @@
         private ResourcePowerStats gatherResourcePowerConsumptionStats(ComputingResource resource) {
                 double power = 0;
-                ResourcePowerStats resEnergyUsage = new ResourcePowerStats(resource.getName(), resource.getType(), "resourcePowerConsumptionStats");
+                ResourcePowerStats resEnergyUsage = new ResourcePowerStats(resource.getFullName(), resource.getType(), "resourcePowerConsumptionStats");
                 Map<Long, Double> usage = resEnergyUsage.getHistory();
                 
@@ -670 +670 @@
         private ResourceAirFlowStats gatherResourceAirFlowStats(ComputingResource resource) {
 
-                ResourceAirFlowStats resAirFlow = new ResourceAirFlowStats(resource.getName(), resource.getType(), "resourceAirFlowStats");
+                ResourceAirFlowStats resAirFlow = new ResourceAirFlowStats(resource.getFullName(), resource.getType(), "resourceAirFlowStats");
                 Map<Long, Double> airFlow = resAirFlow.getHistory();
                 
@@ -696 +696 @@
         private ResourceTemperatureStats gatherResourceTemperatureStats(ComputingResource resource) {
 
-                ResourceTemperatureStats resTemperature = new ResourceTemperatureStats(resource.getName(), resource.getType(), "resourceTemperatureStats");
+                ResourceTemperatureStats resTemperature = new ResourceTemperatureStats(resource.getFullName(), resource.getType(), "resourceTemperatureStats");
                 Map<Long, Double> temperature = resTemperature.getHistory();