Changeset 257 for xssim/branches/tpiontek/src/test/rewolucja/energy/profile/implementation/CPUPowerProfile.java

Timestamp:

04/12/12 14:52:29 (13 years ago)

Author:

piontek

Message:

 

File:

• xssim/branches/tpiontek/src/test/rewolucja/energy/profile/implementation/CPUPowerProfile.java (modified) (2 diffs)

xssim/branches/tpiontek/src/test/rewolucja/energy/profile/implementation/CPUPowerProfile.java

@@ -111 +111 @@
                 if(newPState != null)
                 {
-                        double factor = newPState.getFrequency() / pState.getFrequency();
-                        
                         pState = newPState;
                         CpuSpeed speed = (CpuSpeed )cpu.getResourceCharacteristic().getResourceUnits().get(ResourceParameterName.CPUSPEED).get(0);
-                        speed.setAmount( (int)(speed.getAmount() * factor));
+                        speed.setAmount( newPState.getSpeed());
                         
                         cpu.handleEvent(new EnergyEvent(EnergyEventType.FREQUENCY_CHANGED, cpu.getName()));
@@ -132 +130 @@
                 static {
                         Map<PStateType, PState> pStatesMap = new HashMap<PStateType, PState>();
-                        pStatesMap.put(PStateType.P0, new PState(PStateType.P0, 3000, 0, 350));
-                        pStatesMap.put(PStateType.P1, new PState(PStateType.P1, 2660, 0, 343));
-                        pStatesMap.put(PStateType.P2, new PState(PStateType.P2, 2330, 0, 337));
-                        pStatesMap.put(PStateType.P3, new PState(PStateType.P3, 2000, 0, 330));
+                        pStatesMap.put(PStateType.P0, new PState(PStateType.P0, 3000, 0, 350, 1000));
+                        pStatesMap.put(PStateType.P1, new PState(PStateType.P1, 2660, 0, 343, 1000));
+                        pStatesMap.put(PStateType.P2, new PState(PStateType.P2, 2330, 0, 337, 1000));
+                        pStatesMap.put(PStateType.P3, new PState(PStateType.P3, 2000, 0, 330, 1000));
                         pStates = Collections.unmodifiableMap(pStatesMap);
                 }