Drop s4u::Host::getPstateSpeedCurrent() which dupplicates Host::speed()

[simgrid.git] / examples / msg / energy-pstate / energy-pstate.tesh

diff --git a/examples/msg/energy-pstate/energy-pstate.tesh b/examples/msg/energy-pstate/energy-pstate.tesh
index 6628264..48a3f1a 100644 (file)
--- a/examples/msg/energy-pstate/energy-pstate.tesh
+++ b/examples/msg/energy-pstate/energy-pstate.tesh
@@ -4,8 +4,8 @@ p Testing the DVFS-related functions
 
 $ ${bindir:=.}/energy-pstate/energy-pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
-> [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000
+> [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (2:dvfs_test@MyHost2) Current power peak=100000000.000000
 > [  1.000000] (1:dvfs_test@MyHost1) Task1 simulation time: 1.000000e+00
 > [  1.000000] (2:dvfs_test@MyHost2) Task1 simulation time: 1.000000e+00
@@ -15,16 +15,16 @@ $ ${bindir:=.}/energy-pstate/energy-pstate$EXEEXT ${srcdir:=.}/../platforms/ener
 > [  1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
 > [  6.000000] (1:dvfs_test@MyHost1) Task2 simulation time: 5.000000e+00
 > [  6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
+> [  6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
 > [  6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00
 > [  6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
-> [  6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
 > [  6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
 > [  6.000000] (0:maestro@) Total simulation time: 6.000000e+00
 
 $ ${bindir:=.}/energy-pstate/energy-pstate$EXEEXT ${srcdir:=.}/../platforms/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
-> [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000
+> [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (2:dvfs_test@MyHost2) Current power peak=100000000.000000
 > [  1.000000] (1:dvfs_test@MyHost1) Task1 simulation time: 1.000000e+00
 > [  1.000000] (2:dvfs_test@MyHost2) Task1 simulation time: 1.000000e+00
@@ -34,8 +34,8 @@ $ ${bindir:=.}/energy-pstate/energy-pstate$EXEEXT ${srcdir:=.}/../platforms/ener
 > [  1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
 > [  6.000000] (1:dvfs_test@MyHost1) Task2 simulation time: 5.000000e+00
 > [  6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
+> [  6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
 > [  6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00
 > [  6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
-> [  6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000
 > [  6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000
 > [  6.000000] (0:maestro@) Total simulation time: 6.000000e+00