Changeset 495 for DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput

Files:

• AirFlowValue.java (added)
• AirThroughputInterfaceFactory.java (added)
• AirThroughputProfile.java (modified) (3 diffs)
• ui/AirThroughputInterface.java (modified) (1 diff)
• ui/DefaultAirThroughputInterface.java (moved) (moved from DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput/ui/DefaultAirThrougputInterface.java) (3 diffs)

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput/AirThroughputProfile.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.airthroughput;
 
+import java.util.ArrayList;
 import java.util.List;
+
+import org.joda.time.DateTimeUtils;
 
 import schedframe.Parameters;
@@ -7 +10 @@
 
 public class AirThroughputProfile {
+        
+        protected List<AirFlowValue> airFlowHistory;
         
         protected AirThroughputEstimationPlugin airThroughputEstimationPlugin;
@@ -16 +21 @@
                 this.airThroughputEstimationPlugin = airThroughputEstimationPlugin;
                 this.airThroughputStates = airThroughputStates;
+                this.airFlowHistory = new ArrayList<AirFlowValue>();
         }
 
         public List<AirThroughputState> getAirThroughputStates() {
                 return airThroughputStates;
+        }
+        
+        public void addToPowerUsageHistory(double airFlow) {
+
+                if (airFlowHistory.size() == 0) {
+                        AirFlowValue usage = new AirFlowValue(DateTimeUtils.currentTimeMillis(), airFlow);
+                        airFlowHistory.add(usage);
+                        return;
+                }
+
+                int lastIdx = airFlowHistory.size() - 1;
+                double lastAirFlow = airFlowHistory.get(lastIdx).getValue();
+                if (lastAirFlow != airFlow) {
+                        AirFlowValue usage = airFlowHistory.get(lastIdx);
+                        long currentTime = DateTimeUtils.currentTimeMillis();
+                        if (usage.getTimestamp() == currentTime) {
+                                usage.setValue(airFlow);
+                                if(lastIdx > 0 && airFlowHistory.get(lastIdx - 1).getValue() == airFlow)
+                                        airFlowHistory.remove(usage);
+                        } else {
+                                usage = new AirFlowValue(DateTimeUtils.currentTimeMillis(), airFlow);
+                                airFlowHistory.add(usage);
+                        }
+                }
+        }
+
+        public List<AirFlowValue> getAirThroughputHistory() {
+                return airFlowHistory;
         }
         

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput/ui/AirThroughputInterface.java

@@ -10 +10 @@
         public String getAirThroughputState();
         
-        public boolean setAirThroughputState(String airThrougputState);
+        public boolean setAirThroughputState(String airThroughputState);
         
         public boolean supportAirThroughputState(String powerState);

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/airthroughput/ui/DefaultAirThroughputInterface.java

@@ -6 +6 @@
 import schedframe.Parameters;
 import schedframe.resources.computing.ComputingResource;
+import schedframe.resources.computing.profiles.energy.EnergyEvent;
+import schedframe.resources.computing.profiles.energy.EnergyEventType;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputProfile;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputState;
 
-public class DefaultAirThrougputInterface implements AirThroughputInterface{
+public class DefaultAirThroughputInterface implements AirThroughputInterface{
 
         protected String currentAirThroughputState;
         protected AirThroughputProfile airThroughputProfile;
         protected ComputingResource resource;
+        
+        public DefaultAirThroughputInterface(ComputingResource resource, AirThroughputProfile airThroughputProfile){
+                this.resource = resource;
+                this.airThroughputProfile = airThroughputProfile;
+        }
         
         public String getAirThroughputState() {
@@ -22 +29 @@
                 if(supportAirThroughputState(state)){
                         currentAirThroughputState = state;
+                        
+                        //TO DO - notifications should be called for all resources starting form the lowest layer
+                        resource.handleEvent(new EnergyEvent(EnergyEventType.AIRFLOW_STATE_CHANGED, resource.getName()));
+
                         return true;
                 }
@@ -28 +39 @@
 
         public boolean supportAirThroughputState(String state) {
-
                 for(AirThroughputState airFlowState: airThroughputProfile.getAirThroughputStates()){
                         if(airFlowState.getName().equals(state)){