Changeset 1438 for DCWoRMS/branches

Timestamp:

09/18/14 15:03:06 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power

Files:

• PowerProfile.java (modified) (4 diffs)
• PowerStateNameFactory.java (modified) (1 diff)
• Transition.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerProfile.java

@@ -26 +26 @@
                 this.supportedPowerStates = powerStates;
                 this.powerUsage = new ArrayList<PowerUsage>();
+                initTransitionStates();
                 initDefaultPowerStates();
         }
@@ -38 +39 @@
                         supportedPStates.put(pState.getName(), pState);
                 }
+                initTransitionStates();
                 initDefaultPowerStates();
         }
@@ -112 +114 @@
                 return parameters;
         }
-
+        
+        protected void initTransitionStates(){
+                if(supportedPowerStates != null){
+                        List<PowerState> transitionPowerStates = new ArrayList<PowerState>(0);
+                        for(PowerState ps: supportedPowerStates){
+                                for(Transition t: ps.getTransitions()){
+                                        transitionPowerStates.add(new PowerState(t.getName(), t.getPowerUsage(), new ArrayList<Transition>(0)));
+                                }
+                        }
+                        supportedPowerStates.addAll(transitionPowerStates);
+                }
+        }
+        
         protected void initDefaultPowerStates(){
                 boolean supportsON = false;
                 boolean supportsOFF = false;
                 if(supportedPowerStates == null){
-                        supportedPowerStates = new ArrayList<PowerState>(4);
+                        supportedPowerStates = new ArrayList<PowerState>(2);
                 }
                 for(PowerState ps: supportedPowerStates){
@@ -126 +140 @@
                         }
                 }
-                
                 if(!supportsON){
-                        supportedPowerStates.add(new PowerState(StandardPowerStateName.ON, -1, null));
-                        supportedPowerStates.add(new PowerState(StandardPowerStateName.BOOT, -1, null));
+                        supportedPowerStates.add(new PowerState(StandardPowerStateName.ON, -1, new ArrayList<Transition>(0)));
                 }
                 if(!supportsOFF){
-                        supportedPowerStates.add(new PowerState(StandardPowerStateName.OFF, -1, null));
-                        supportedPowerStates.add(new PowerState(StandardPowerStateName.POWEROFF, -1, null));
+                        supportedPowerStates.add(new PowerState(StandardPowerStateName.OFF, -1, new ArrayList<Transition>(0)));
                 }
         }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerStateNameFactory.java

@@ -12 +12 @@
                         return StandardPowerStateName.OFF;
                 
+                else if(powerStateName.equals(StandardPowerStateName.BOOT.getLabel()))
+                        return StandardPowerStateName.BOOT;
+                
+                else if(powerStateName.equals(StandardPowerStateName.POWEROFF.getLabel()))
+                        return StandardPowerStateName.POWEROFF;
+                
                 else if(powerStateName.equals(StandardPowerStateName.HIBERNATE.getLabel()))
                         return StandardPowerStateName.HIBERNATE;

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/Transition.java

@@ -4 +4 @@
 
 public class Transition {
+        protected PowerStateName name;
         protected PowerStateName to;
         protected double powerUsage;
         protected double time;
         
-        public Transition(PowerStateName to, double powerUsage, double time) {
+        public Transition(PowerStateName name, PowerStateName to, double powerUsage, double time) {
                 super();
+                this.name = name;
                 this.to = to;
                 this.powerUsage = powerUsage;
                 this.time = time;
+        }
+        public PowerStateName getName() {
+                return name;
         }
         public PowerStateName getTo() {