Changeset 1399 for DCWoRMS/branches/coolemall/src/test/powerCapping

Timestamp:

06/26/14 14:24:08 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/test/powerCapping

Files:

• CB2_FCFS_Random_SP.java (modified) (5 diffs)
• FanEnergyEstimationPlugin.java (modified) (3 diffs)
• NodeEnergyEstimationPlugin.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/test/powerCapping/CB2_FCFS_Random_SP.java

@@ -17 +17 @@
 import schedframe.resources.computing.Rack;
 import schedframe.resources.computing.coolemall.ComputeBox1;
-import schedframe.resources.computing.profiles.energy.airthroughput.UserAirThroughputStateName;
+import schedframe.resources.computing.profiles.energy.airthroughput.CustomAirflowStateName;
 import schedframe.resources.computing.profiles.energy.power.PState;
 import schedframe.resources.devices.Device;
@@ -31 +31 @@
 import schedframe.scheduling.plan.SchedulingPlanInterface;
 import schedframe.scheduling.plan.impl.SchedulingPlan;
-import schedframe.scheduling.plugin.grid.ModuleList;
+import schedframe.scheduling.plugin.ModuleList;
 import schedframe.scheduling.queue.TaskQueue;
 import schedframe.scheduling.queue.TaskQueueList;
@@ -134 +134 @@
 
                                                         if(fan.getChilledResources().contains(n.getFullName())){
-                                                                fan.getAirThroughputInterface().setAirThroughputState(new UserAirThroughputStateName("2"));
+                                                                fan.getAirflowInterface().setAirflowState(new CustomAirflowStateName("2"));
                                                         }
                                                 }
@@ -258 +258 @@
 
                                                                                 if(fan.getChilledResources().contains(n.getFullName())){
-                                                                                        fan.getAirThroughputInterface().setAirThroughputState(new UserAirThroughputStateName("2"));
+                                                                                        fan.getAirflowInterface().setAirflowState(new CustomAirflowStateName("2"));
                                                                                 }
                                                                         }
@@ -351 +351 @@
 
                                                                                 if(fan.getChilledResources().contains(n.getFullName())){
-                                                                                        fan.getAirThroughputInterface().setAirThroughputState(new UserAirThroughputStateName("2"));
+                                                                                        fan.getAirflowInterface().setAirflowState(new CustomAirflowStateName("2"));
                                                                                 }
                                                                         }

DCWoRMS/branches/coolemall/src/test/powerCapping/FanEnergyEstimationPlugin.java

@@ -22 +22 @@
                 Fan fan = (Fan) resource;
                 try {
-                        powerConsumption = fan.getAirThroughputInterface().getPowerConsumption(fan.getAirThroughputInterface().getAirThroughputState());
+                        powerConsumption = fan.getAirflowInterface().getPowerConsumption(fan.getAirflowInterface().getAirflowState());
                 } catch (NoSuchFieldException e) {
                         // TODO Auto-generated catch block
@@ -36 +36 @@
         }
         
-        public double estimateAirThroughput(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource) {
+        public double estimateAirflow(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource) {
                 
-                double airThroughput = 0;
+                double airflow = 0;
                 Fan fan = (Fan) resource;
                 try {
                         if(event.getReason() == EventReason.SIM_INIT)
-                                airThroughput = fan.getAirThroughputInterface().getAirFlow(fan.getAirThroughputInterface().getAirThroughputState());
+                                airflow = fan.getAirflowInterface().getAirflow(fan.getAirflowInterface().getAirflowState());
                         else
-                                airThroughput = fan.getAirThroughputInterface().getAirFlow(fan.getAirThroughputInterface().getAirThroughputState());
+                                airflow = fan.getAirflowInterface().getAirflow(fan.getAirflowInterface().getAirflowState());
                 } catch (NoSuchFieldException e) {
                         // TODO Auto-generated catch block
@@ -64 +64 @@
                         }
                 }*/
-
                 
-                return airThroughput * getFactor(fan)/(double)fan.getChilledResources().size();
+                return airflow * getFactor(fan)/(double)fan.getChilledResources().size();
         }
         

DCWoRMS/branches/coolemall/src/test/powerCapping/NodeEnergyEstimationPlugin.java

@@ -40 +40 @@
                                                 if(fan.getPowerInterface().getRecentPowerUsage().getValue() == -1){
                                                         try {
-                                                                powerConsumption = powerConsumption + fan.getAirThroughputInterface().getPowerConsumption(fan.getAirThroughputInterface().getAirThroughputState())/getNumberOfWorkingNodes(fan);
+                                                                powerConsumption = powerConsumption + fan.getAirflowInterface().getPowerConsumption(fan.getAirflowInterface().getAirflowState())/getNumberOfWorkingNodes(fan);
                                                         } catch (NoSuchFieldException e) {
                                                                 // TODO Auto-generated catch block