[#!] #! ./tesh -> #!/usr/bin/env tesh

[simgrid.git] / examples / s4u / energy-link / s4u-energy-link.tesh

diff --git a/examples/s4u/energy-link/s4u-energy-link.tesh b/examples/s4u/energy-link/s4u-energy-link.tesh
index 2622a4b..1e1c65d 100644 (file)
--- a/examples/s4u/energy-link/s4u-energy-link.tesh
+++ b/examples/s4u/energy-link/s4u-energy-link.tesh
@@ -1,8 +1,8 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the mechanism for computing link energy consumption (using CM02 as a network model)
 
-$ ${bindir:=.}/s4u-energy-link$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no
+$ ${bindir:=.}/s4u-energy-link$EXEEXT ${platfdir}/energy_platform.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no'
 > [  0.000000] (0:maestro@) Activating the SimGrid link energy plugin
@@ -10,12 +10,12 @@ $ ${bindir:=.}/s4u-energy-link$EXEEXT ${srcdir:=.}/../platforms/energy_platform.
 > [  0.000000] (2:receiver@MyHost2) Receiving 1 flows ...
 > [ 10.250000] (2:receiver@MyHost2) receiver done.
 > [ 10.250000] (1:sender@MyHost1) sender done.
-> [ 10.250000] (0:maestro@) Link 'bus' total consumption: 10.750000
 > [ 10.250000] (0:maestro@) Total energy over all links: 10.750000
+> [ 10.250000] (0:maestro@) Energy consumption of link 'bus': 10.750000 Joules
 
 p And now test with 500000 bytes
 
-$ ${bindir:=.}/s4u-energy-link$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml 1 50000000 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no
+$ ${bindir:=.}/s4u-energy-link$EXEEXT ${platfdir}/energy_platform.xml 1 50000000 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:CM02 --cfg=network/crosstraffic:no
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to 'no'
 > [  0.000000] (0:maestro@) Activating the SimGrid link energy plugin
@@ -23,6 +23,5 @@ $ ${bindir:=.}/s4u-energy-link$EXEEXT ${srcdir:=.}/../platforms/energy_platform.
 > [  0.000000] (2:receiver@MyHost2) Receiving 1 flows ...
 > [510.000000] (2:receiver@MyHost2) receiver done.
 > [510.000000] (1:sender@MyHost1) sender done.
-> [510.000000] (0:maestro@) Link 'bus' total consumption: 1510.000000
 > [510.000000] (0:maestro@) Total energy over all links: 1510.000000
-
+> [510.000000] (0:maestro@) Energy consumption of link 'bus': 1510.000000 Joules