Merge branch 'master' into v3.20-expose-simgrid-jni

[simgrid.git] / examples / java / energy / vm / energy-vm.tesh

diff --git a/examples/java/energy/vm/energy-vm.tesh b/examples/java/energy/vm/energy-vm.tesh
index 3afdf2d..e07fb6a 100644 (file)
--- a/examples/java/energy/vm/energy-vm.tesh
+++ b/examples/java/energy/vm/energy-vm.tesh
@@ -1,4 +1,4 @@
-#! tesh
+#!/usr/bin/env tesh
 
 $ java -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../platforms/energy_platform.xml
 > [0.000000] [java/INFO] Using regular java threads.
@@ -8,14 +8,14 @@ $ java -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../platforms/energ
 > [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Create two tasks on Host3: both inside a VM
 > [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds)
 > [MyHost1:energy VM runner:(1) 5.000000] [java/INFO] Wait another 5 seconds. The tasks stop at some point in between
-> [MyHost3:p31:(6) 6.000000] [java/INFO] This worker is done.
-> [MyHost3:p312:(7) 6.000000] [java/INFO] This worker is done.
 > [MyHost2:p22:(5) 6.000000] [java/INFO] This worker is done.
+> [MyHost3:p312:(7) 6.000000] [java/INFO] This worker is done.
+> [MyHost3:p31:(6) 6.000000] [java/INFO] This worker is done.
 > [vmHost1:p12:(3) 6.000000] [java/INFO] This worker is done.
-> [vmHost3:p21:(4) 6.000000] [java/INFO] This worker is done.
 > [vmHost1:p11:(2) 6.000000] [java/INFO] This worker is done.
+> [vmHost3:p21:(4) 6.000000] [java/INFO] This worker is done.
 > [10.000000] [surf_energy/INFO] Total energy consumption: 4320.000000 Joules (used hosts: 4320.000000 Joules; unused/idle hosts: 0.000000)
-> [10.000000] [java/INFO] MSG_main finished; Cleaning up the simulation...
+> [10.000000] [java/INFO] MSG_main finished; Terminating the simulation...
 > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 1120.000000 Joules
 > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 1600.000000 Joules
 > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 1600.000000 Joules