Changeset 520

Timestamp:

10/16/12 11:05:28 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src

Files:

• example/energy/DataCenterEnergyEstimationPlugin.java (modified) (2 diffs)
• schedframe/resources/computing/DataCenter.java (modified) (2 diffs)
• simulator/stats/implementation/DCWormsStatistics.java (modified) (2 diffs)
• test/experiment_result (added)
• test/experiment_result/Chart_Simulation 1_Energy - Processor.png (added)
• test/experiment_result/Chart_Simulation 1_Gantt.png (added)
• test/experiment_result/Stats_Simulation 1_AirThroughput.txt (added)
• test/experiment_result/Stats_Simulation 1_EnergyUsage.txt (added)
• test/experiment_result/Stats_Simulation 1_Jobs.txt (added)
• test/experiment_result/Stats_Simulation 1_ResourceUtilization.txt (added)
• test/experiment_result/Stats_Simulation 1_Simulation.txt (added)
• test/experiment_result/Stats_Simulation 1_Tasks.txt (added)
• test/experiment_result/experiment.properties (added)

DCWoRMS/trunk/src/example/energy/DataCenterEnergyEstimationPlugin.java

@@ -3 +3 @@
 import schedframe.resources.computing.ComputingNode;
 import schedframe.resources.computing.ComputingResource;
+import schedframe.resources.computing.DataCenter;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
 import schedframe.resources.computing.profiles.energy.power.PowerUsage;
@@ -13 +14 @@
                         ComputingResource resource) {
                 double power = 0;
-                for(ComputingResource child:resource.getChildren()){
-                        ComputingNode node = (ComputingNode)child;
-                        PowerUsage powerUsage = node.getPowerInterface().getRecentPowerUsage();
+                DataCenter dataCenter = (DataCenter)resource;
+                for(ComputingNode cn:dataCenter.getComputingNodes()){
+                        PowerUsage powerUsage = cn.getPowerInterface().getRecentPowerUsage();
                         power += (powerUsage == null ? 0 : powerUsage.getValue());
                 }

DCWoRMS/trunk/src/schedframe/resources/computing/DataCenter.java

@@ -1 +1 @@
 package schedframe.resources.computing;
 
+import java.util.List;
+
+import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.description.ComputingResourceDescription;
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
@@ -19 +22 @@
                 e.setResource(this);
         }
+        
+        @SuppressWarnings("unchecked")
+        public List<ComputingNode> getComputingNodes(){
+                return (List<ComputingNode>) getDescendantsByType(StandardResourceType.ComputingNode);
+        }
 }

DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -333 +333 @@
                                                 EnergyExtension een = (EnergyExtension)(resource.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
                                                 if(resourceController.getComputingResources().contains(resource)) {
-                                                        if( een != null /*&& een.getPp() != null*/ ){
+                                                        if( een != null && een.getPowerProfile() != null ){
                                                                 accStats.meanEnergyUsage.add(energyUsage.getMeanValue());
                                                         }
@@ -339 +339 @@
                                                 } else if( een != null && een.getPowerProfile() != null ){
                                                         ComputingResource parent = resource.getParent();
-                                                        een = (EnergyExtension)(parent.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
                                                         boolean top = true;
                                                         while(parent != null){
+                                                                een = (EnergyExtension)(parent.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
                                                                 if(een != null &&  een.getPowerProfile() != null) {
                                                                         top = false;