fix the tesh outputs after last output cleanups

diff --git a/examples/async/async.tesh b/examples/async/async.tesh
index 8782d07..2efb017 100644 (file)
--- a/examples/async/async.tesh
+++ b/examples/async/async.tesh
@@ -3,7 +3,6 @@
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar async/AsyncTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/async/asyncDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar async/AsyncTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/async/asyncDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (0:@) Ready to run MSG_MAIN

 > [  0.000000] (10:async.Slave@Robert) Receiving on 'slave_8'
 > [  0.000000] (11:async.Slave@Sirois) Receiving on 'slave_9'
 > [  0.000000] (12:async.Slave@Monique) Receiving on 'slave_10'
 > [  0.000000] (10:async.Slave@Robert) Receiving on 'slave_8'
 > [  0.000000] (11:async.Slave@Sirois) Receiving on 'slave_9'
 > [  0.000000] (12:async.Slave@Monique) Receiving on 'slave_10'


@@ -53,8 +52,5 @@ $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar async/AsyncTest ${sr
 > [ 25.000000] (1:async.Master@Jacquelin) Goodbye now!
 > [ 25.851463] (2:async.Forwarder@Jackson) I'm done. See you!
 > [ 26.357007] (3:async.Forwarder@Casavant) I'm done. See you!
 > [ 25.000000] (1:async.Master@Jacquelin) Goodbye now!
 > [ 25.851463] (2:async.Forwarder@Jackson) I'm done. See you!
 > [ 26.357007] (3:async.Forwarder@Casavant) I'm done. See you!

-> [ 29.000728] (0:@) Done running MSG_MAIN
-> [ 29.000728] (0:@) MSG_main finished
-> [ 29.000728] (0:@) Clean java world
-> [ 29.000728] (0:@) Clean native world
+> [ 29.000728] (0:@) MSG_main finished; Cleaning up the simulation...

 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

diff --git a/examples/bittorrent/bittorrent.tesh b/examples/bittorrent/bittorrent.tesh
index e45857a..1e170eb 100644 (file)
--- a/examples/bittorrent/bittorrent.tesh
+++ b/examples/bittorrent/bittorrent.tesh
@@ -4,11 +4,7 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar bittorrent/Bittorrent ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/bittorrent/bittorrent.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar bittorrent/Bittorrent ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/bittorrent/bittorrent.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
-> [5000.832370] [jmsg/INFO] Done running MSG_MAIN
-> [5000.832370] [jmsg/INFO] MSG_main finished
-> [5000.832370] [jmsg/INFO] Clean java world
-> [5000.832370] [jmsg/INFO] Clean native world
+> [5000.832370] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [Boivin:bittorrent.Peer:(2) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 2
 > [Boivin:bittorrent.Peer:(2) 5000.048882] [jmsg/INFO] Here is my current status: 1111111111
 > [Disney:bittorrent.Peer:(6) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 6
 > [Boivin:bittorrent.Peer:(2) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 2
 > [Boivin:bittorrent.Peer:(2) 5000.048882] [jmsg/INFO] Here is my current status: 1111111111
 > [Disney:bittorrent.Peer:(6) 0.000000] [jmsg/INFO] Hi, I'm joining the network with id 6

diff --git a/examples/chord/chord.tesh b/examples/chord/chord.tesh
index 9e21e8a..ba3f52e 100644 (file)
--- a/examples/chord/chord.tesh
+++ b/examples/chord/chord.tesh
@@ -4,11 +4,7 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar chord/Chord ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/chord/chord.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar chord/Chord ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/chord/chord.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
-> [652.548539] [jmsg/INFO] Done running MSG_MAIN
-> [652.548539] [jmsg/INFO] MSG_main finished
-> [652.548539] [jmsg/INFO] Clean java world
-> [652.548539] [jmsg/INFO] Clean native world
+> [652.548539] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [Boivin:chord.Node:(7) 0.000000] [jmsg/INFO] Joining the ring with id 8 knowing node 1
 > [Gatien:chord.Node:(1) 0.000000] [jmsg/INFO] Joining the ring with id 48 knowing node 1
 > [Geoff:chord.Node:(4) 0.000000] [jmsg/INFO] Joining the ring with id 32 knowing node 1
 > [Boivin:chord.Node:(7) 0.000000] [jmsg/INFO] Joining the ring with id 8 knowing node 1
 > [Gatien:chord.Node:(1) 0.000000] [jmsg/INFO] Joining the ring with id 48 knowing node 1
 > [Geoff:chord.Node:(4) 0.000000] [jmsg/INFO] Joining the ring with id 32 knowing node 1

diff --git a/examples/cloud/cloud.tesh b/examples/cloud/cloud.tesh
index 9b191bd..bdb2c12 100644 (file)
--- a/examples/cloud/cloud.tesh
+++ b/examples/cloud/cloud.tesh
@@ -3,7 +3,6 @@
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar cloud/Cloud ${srcdir:=.}/examples/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar cloud/Cloud ${srcdir:=.}/examples/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (0:@) Ready to run MSG_MAIN

 > [  0.000000] (10:Slave 8@Jean_Yves) Receiving on slave_8
 > [  0.000000] (11:Slave 9@Fafard) Receiving on slave_9
 > [  0.000000] (1:Master@Jacquelin) Launched 10 VMs
 > [  0.000000] (10:Slave 8@Jean_Yves) Receiving on slave_8
 > [  0.000000] (11:Slave 9@Fafard) Receiving on slave_9
 > [  0.000000] (1:Master@Jacquelin) Launched 10 VMs


@@ -151,10 +150,7 @@ $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar cloud/Cloud ${srcdir
 > [1021.445768] (20:Slave 18@Provost) Received "Task_18". Processing it.
 > [1021.445768] (20:Slave 18@Provost) "Task_18" done 
 > [1021.445768] (20:Slave 18@Provost) Receiving on slave_18
 > [1021.445768] (20:Slave 18@Provost) Received "Task_18". Processing it.
 > [1021.445768] (20:Slave 18@Provost) "Task_18" done 
 > [1021.445768] (20:Slave 18@Provost) Receiving on slave_18

-> [1023.430577] (0:@) Done running MSG_MAIN
-> [1023.430577] (0:@) MSG_main finished
-> [1023.430577] (0:@) Clean java world
-> [1023.430577] (0:@) Clean native world
+> [1023.430577] (0:@) MSG_main finished; Cleaning up the simulation...

 > [1023.430577] (1:Master@Jacquelin) Let's shut down the simulation and kill everyone.
 > [1023.430577] (1:Master@Jacquelin) Master done.
 > [1023.430577] (21:Slave 19@Provost) Received "Task_19". Processing it.
 > [1023.430577] (1:Master@Jacquelin) Let's shut down the simulation and kill everyone.
 > [1023.430577] (1:Master@Jacquelin) Master done.
 > [1023.430577] (21:Slave 19@Provost) Received "Task_19". Processing it.

diff --git a/examples/commTime/commtime.tesh b/examples/commTime/commtime.tesh
index 0847b8b..c7bf972 100644 (file)
--- a/examples/commTime/commtime.tesh
+++ b/examples/commTime/commtime.tesh
@@ -4,11 +4,7 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar commTime/CommTimeTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/commTime/commTimeDeployment.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar commTime/CommTimeTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/commTime/commTimeDeployment.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
-> [7016.935689] [jmsg/INFO] Done running MSG_MAIN
-> [7016.935689] [jmsg/INFO] MSG_main finished
-> [7016.935689] [jmsg/INFO] Clean java world
-> [7016.935689] [jmsg/INFO] Clean native world
+> [7016.935689] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [Bellemarre:commTime.Slave:(15) 0.000000] [jmsg/INFO] Receiving on 'slave_13'
 > [Bellemarre:commTime.Slave:(15) 7006.824050] [jmsg/INFO] Received Finalize. I'm done. See you!
 > [Boucherville:commTime.Slave:(18) 0.000000] [jmsg/INFO] Receiving on 'slave_16'
 > [Bellemarre:commTime.Slave:(15) 0.000000] [jmsg/INFO] Receiving on 'slave_13'
 > [Bellemarre:commTime.Slave:(15) 7006.824050] [jmsg/INFO] Received Finalize. I'm done. See you!
 > [Boucherville:commTime.Slave:(18) 0.000000] [jmsg/INFO] Receiving on 'slave_16'

diff --git a/examples/kademlia/kademlia.tesh b/examples/kademlia/kademlia.tesh
index d2b2d3f..7396956 100644 (file)
--- a/examples/kademlia/kademlia.tesh
+++ b/examples/kademlia/kademlia.tesh
@@ -4,11 +4,7 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar kademlia/Kademlia ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/kademlia/kademlia.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar kademlia/Kademlia ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/kademlia/kademlia.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
-> [900.000000] [jmsg/INFO] Done running MSG_MAIN
-> [900.000000] [jmsg/INFO] MSG_main finished
-> [900.000000] [jmsg/INFO] Clean java world
-> [900.000000] [jmsg/INFO] Clean native world
+> [900.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [Boivin:kademlia.Node:(2) 0.000000] [jmsg/INFO] Hi, I'm going to join the network with the id 1!
 > [Boivin:kademlia.Node:(2) 900.000000] [jmsg/INFO] 8/8 FIND_NODE have succedded.
 > [Jacquelin:kademlia.Node:(1) 0.000000] [jmsg/INFO] Hi, I'm going to create the network with the id 0!
 > [Boivin:kademlia.Node:(2) 0.000000] [jmsg/INFO] Hi, I'm going to join the network with the id 1!
 > [Boivin:kademlia.Node:(2) 900.000000] [jmsg/INFO] 8/8 FIND_NODE have succedded.
 > [Jacquelin:kademlia.Node:(1) 0.000000] [jmsg/INFO] Hi, I'm going to create the network with the id 0!

diff --git a/examples/master_slave_bypass/bypass.tesh b/examples/master_slave_bypass/bypass.tesh
index aedfdd0..dfcc347 100644 (file)
--- a/examples/master_slave_bypass/bypass.tesh
+++ b/examples/master_slave_bypass/bypass.tesh
@@ -4,11 +4,7 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar master_slave_bypass/MsBypass ${srcdir:=.}/examples/master_slave_bypass/platform.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar master_slave_bypass/MsBypass ${srcdir:=.}/examples/master_slave_bypass/platform.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
-> [0.013010] [jmsg/INFO] Done running MSG_MAIN
-> [0.013010] [jmsg/INFO] MSG_main finished
-> [0.013010] [jmsg/INFO] Clean java world
-> [0.013010] [jmsg/INFO] Clean native world
+> [0.013010] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [alice:process2:(2) 0.000000] [jmsg/INFO] Slave Hello!
 > [alice:process2:(2) 0.000000] [jmsg/INFO] Send finalize!
 > [bob:process1:(1) 0.000000] [jmsg/INFO] Master Hello!
 > [alice:process2:(2) 0.000000] [jmsg/INFO] Slave Hello!
 > [alice:process2:(2) 0.000000] [jmsg/INFO] Send finalize!
 > [bob:process1:(1) 0.000000] [jmsg/INFO] Master Hello!

diff --git a/examples/master_slave_kill/kill.tesh b/examples/master_slave_kill/kill.tesh
index 29de2cc..2c7179a 100644 (file)
--- a/examples/master_slave_kill/kill.tesh
+++ b/examples/master_slave_kill/kill.tesh
@@ -4,11 +4,7 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar master_slave_kill/MsKill ${srcdir:=.}/examples/master_slave_kill/platform.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar master_slave_kill/MsKill ${srcdir:=.}/examples/master_slave_kill/platform.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
-> [0.013010] [jmsg/INFO] Done running MSG_MAIN
-> [0.013010] [jmsg/INFO] MSG_main finished
-> [0.013010] [jmsg/INFO] Clean java world
-> [0.013010] [jmsg/INFO] Clean native world
+> [0.013010] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [alice:slave:(2) 0.000000] [jmsg/INFO] Slave Hello!
 > [alice:slave:(2) 0.000000] [jmsg/INFO] Send Mail1!
 > [bob:master:(1) 0.000000] [jmsg/INFO] Master Hello!
 > [alice:slave:(2) 0.000000] [jmsg/INFO] Slave Hello!
 > [alice:slave:(2) 0.000000] [jmsg/INFO] Send Mail1!
 > [bob:master:(1) 0.000000] [jmsg/INFO] Master Hello!

diff --git a/examples/masterslave/masterslave.tesh b/examples/masterslave/masterslave.tesh
index 9c7509d..243f4c4 100644 (file)
--- a/examples/masterslave/masterslave.tesh
+++ b/examples/masterslave/masterslave.tesh
@@ -3,7 +3,6 @@
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar masterslave/Masterslave ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar masterslave/Masterslave ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/masterslave/masterslaveDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (0:@) Ready to run MSG_MAIN

 > [  0.000000] (1:masterslave.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process
 > [  0.000000] (2:masterslave.Forwarder@Jackson) Receiving on 'slave_0'
 > [  0.000000] (3:masterslave.Forwarder@Casavant) Receiving on 'slave_1'
 > [  0.000000] (1:masterslave.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process
 > [  0.000000] (2:masterslave.Forwarder@Jackson) Receiving on 'slave_0'
 > [  0.000000] (3:masterslave.Forwarder@Casavant) Receiving on 'slave_1'


@@ -27,10 +26,7 @@ $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar masterslave/Mastersl
 > [ 13.977892] (5:masterslave.Slave@Bousquet) Received Finalize. I'm done. See you!
 > [ 15.421578] (6:masterslave.Slave@Soucy) Received Finalize. I'm done. See you!
 > [ 16.278886] (7:masterslave.Slave@Kuenning) Received Finalize. I'm done. See you!
 > [ 13.977892] (5:masterslave.Slave@Bousquet) Received Finalize. I'm done. See you!
 > [ 15.421578] (6:masterslave.Slave@Soucy) Received Finalize. I'm done. See you!
 > [ 16.278886] (7:masterslave.Slave@Kuenning) Received Finalize. I'm done. See you!

-> [ 17.252217] (0:@) Done running MSG_MAIN
-> [ 17.252217] (0:@) MSG_main finished
-> [ 17.252217] (0:@) Clean java world
-> [ 17.252217] (0:@) Clean native world
+> [ 17.252217] (0:@) MSG_main finished; Cleaning up the simulation...

 > [ 17.252217] (1:masterslave.Master@Jacquelin) Goodbye now!
 > [ 17.252217] (8:masterslave.Slave@Browne) Received Finalize. I'm done. See you!
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 > [ 17.252217] (1:masterslave.Master@Jacquelin) Goodbye now!
 > [ 17.252217] (8:masterslave.Slave@Browne) Received Finalize. I'm done. See you!
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

diff --git a/examples/migration/migration.tesh b/examples/migration/migration.tesh
index dc4c0cf..e40cb50 100644 (file)
--- a/examples/migration/migration.tesh
+++ b/examples/migration/migration.tesh
@@ -3,15 +3,11 @@
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar migration/Migration ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/migration/migrationDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar migration/Migration ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/migration/migrationDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (0:@) Ready to run MSG_MAIN

 > [  0.000000] (1:migration.Emigrant@Jacquelin) I'll look for a new job on another machine where the grass is greener.
 > [  0.000000] (1:migration.Emigrant@Boivin) Yeah, found something to do
 > [  1.000000] (2:migration.Policeman@Boivin) Wait a bit before migrating the emigrant.
 > [  3.000000] (1:migration.Emigrant@Boivin) Moving back to home after work
 > [  0.000000] (1:migration.Emigrant@Jacquelin) I'll look for a new job on another machine where the grass is greener.
 > [  0.000000] (1:migration.Emigrant@Boivin) Yeah, found something to do
 > [  1.000000] (2:migration.Policeman@Boivin) Wait a bit before migrating the emigrant.
 > [  3.000000] (1:migration.Emigrant@Boivin) Moving back to home after work

-> [  7.000000] (0:@) Done running MSG_MAIN
-> [  7.000000] (0:@) MSG_main finished
-> [  7.000000] (0:@) Clean java world
-> [  7.000000] (0:@) Clean native world
+> [  7.000000] (0:@) MSG_main finished; Cleaning up the simulation...

 > [  7.000000] (1:migration.Emigrant@Jacquelin) I've been moved on this new host:Jacquelin
 > [  7.000000] (1:migration.Emigrant@Jacquelin) Uh, nothing to do here. Stopping now
 > [  7.000000] (2:migration.Policeman@Boivin) I moved the emigrant
 > [  7.000000] (1:migration.Emigrant@Jacquelin) I've been moved on this new host:Jacquelin
 > [  7.000000] (1:migration.Emigrant@Jacquelin) Uh, nothing to do here. Stopping now
 > [  7.000000] (2:migration.Policeman@Boivin) I moved the emigrant

diff --git a/examples/mutualExclusion/mutualexclusion.tesh b/examples/mutualExclusion/mutualexclusion.tesh
index 0ad11ff..a8ca174 100644 (file)
--- a/examples/mutualExclusion/mutualexclusion.tesh
+++ b/examples/mutualExclusion/mutualexclusion.tesh
@@ -4,11 +4,7 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar mutualExclusion/centralized/MutexCentral ${srcdir:=.}/examples/mutualExclusion/ring3.xml ${srcdir:=.}/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar mutualExclusion/centralized/MutexCentral ${srcdir:=.}/examples/mutualExclusion/ring3.xml ${srcdir:=.}/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
-> [0.007806] [jmsg/INFO] Done running MSG_MAIN
-> [0.007806] [jmsg/INFO] MSG_main finished
-> [0.007806] [jmsg/INFO] Clean java world
-> [0.007806] [jmsg/INFO] Clean native world
+> [0.007806] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.001301] [jmsg/INFO] Got a request from mutualExclusion.centralized.Node. Queue empty: grant it
 > [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.003903] [jmsg/INFO] Got a request from mutualExclusion.centralized.Node. Queue empty: grant it
 > [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.007806] [jmsg/INFO] we should shutdown the simulation now
 > [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.001301] [jmsg/INFO] Got a request from mutualExclusion.centralized.Node. Queue empty: grant it
 > [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.003903] [jmsg/INFO] Got a request from mutualExclusion.centralized.Node. Queue empty: grant it
 > [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.007806] [jmsg/INFO] we should shutdown the simulation now

diff --git a/examples/pingPong/pingpong.tesh b/examples/pingPong/pingpong.tesh
index f8f28c3..cd4a7bf 100644 (file)
--- a/examples/pingPong/pingpong.tesh
+++ b/examples/pingPong/pingpong.tesh
@@ -4,11 +4,7 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar pingPong/PingPongTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/pingPong/pingPongDeployment.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar pingPong/PingPongTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/pingPong/pingPongDeployment.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
-> [1.048890] [jmsg/INFO] Done running MSG_MAIN
-> [1.048890] [jmsg/INFO] MSG_main finished
-> [1.048890] [jmsg/INFO] Clean java world
-> [1.048890] [jmsg/INFO] Clean native world
+> [1.048890] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [Boivin:pingPong.Receiver:(2) 0.000000] [jmsg/INFO] hello!
 > [Boivin:pingPong.Receiver:(2) 0.000000] [jmsg/INFO] try to get a task
 > [Boivin:pingPong.Receiver:(2) 1.048890] [jmsg/INFO] Got at time 1.0488895059341703
 > [Boivin:pingPong.Receiver:(2) 0.000000] [jmsg/INFO] hello!
 > [Boivin:pingPong.Receiver:(2) 0.000000] [jmsg/INFO] try to get a task
 > [Boivin:pingPong.Receiver:(2) 1.048890] [jmsg/INFO] Got at time 1.0488895059341703

diff --git a/examples/priority/priority.tesh b/examples/priority/priority.tesh
index 9d06d4e..f7ff99b 100644 (file)
--- a/examples/priority/priority.tesh
+++ b/examples/priority/priority.tesh
@@ -3,13 +3,9 @@
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar priority/Priority ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/priority/priorityDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar priority/Priority ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/priority/priorityDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (0:@) Ready to run MSG_MAIN

 > [  0.000000] (1:priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 1.0
 > [  0.000000] (2:priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 2.0
 > [  0.833332] (2:priority.Test@Fafard) Goodbye now!
 > [  0.000000] (1:priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 1.0
 > [  0.000000] (2:priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 2.0
 > [  0.833332] (2:priority.Test@Fafard) Goodbye now!

-> [  1.111109] (0:@) Done running MSG_MAIN
-> [  1.111109] (0:@) MSG_main finished
-> [  1.111109] (0:@) Clean java world
-> [  1.111109] (0:@) Clean native world
+> [  1.111109] (0:@) MSG_main finished; Cleaning up the simulation...

 > [  1.111109] (1:priority.Test@Fafard) Goodbye now!
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 > [  1.111109] (1:priority.Test@Fafard) Goodbye now!
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

diff --git a/examples/startKillTime/startKillTime.tesh b/examples/startKillTime/startKillTime.tesh
index c2e5816..edbe382 100644 (file)
--- a/examples/startKillTime/startKillTime.tesh
+++ b/examples/startKillTime/startKillTime.tesh
@@ -1,7 +1,6 @@
 #! ./tesh
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar startKillTime/StartKillTime ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/startKillTime/deployment_start_kill.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 #! ./tesh
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar startKillTime/StartKillTime ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/startKillTime/deployment_start_kill.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN

 > [Jacquelin:startKillTime.Master:(1) 0.000000] [jmsg/INFO] Hello!
 > [Boivin:startKillTime.Slave:(2) 1.000000] [jmsg/INFO] Hello!
 > [Jean_Yves:startKillTime.Slave:(3) 2.000000] [jmsg/INFO] Hello!
 > [Jacquelin:startKillTime.Master:(1) 0.000000] [jmsg/INFO] Hello!
 > [Boivin:startKillTime.Slave:(2) 1.000000] [jmsg/INFO] Hello!
 > [Jean_Yves:startKillTime.Slave:(3) 2.000000] [jmsg/INFO] Hello!


@@ -9,7 +8,4 @@ $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar startKillTime/StartK
 > [Geoff:startKillTime.Slave:(5) 4.000000] [jmsg/INFO] Hello!
 > [Disney:startKillTime.Slave:(6) 5.000000] [jmsg/INFO] Hello!
 > [Jacquelin:startKillTime.Master:(1) 10.000000] [jmsg/INFO] OK, goodbye now.
 > [Geoff:startKillTime.Slave:(5) 4.000000] [jmsg/INFO] Hello!
 > [Disney:startKillTime.Slave:(6) 5.000000] [jmsg/INFO] Hello!
 > [Jacquelin:startKillTime.Master:(1) 10.000000] [jmsg/INFO] OK, goodbye now.

-> [10.000000] [jmsg/INFO] Done running MSG_MAIN
-> [10.000000] [jmsg/INFO] MSG_main finished
-> [10.000000] [jmsg/INFO] Clean java world
-> [10.000000] [jmsg/INFO] Clean native world
+> [10.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

diff --git a/examples/suspend/suspend.tesh b/examples/suspend/suspend.tesh
index fce16e6..c6ec5f7 100644 (file)
--- a/examples/suspend/suspend.tesh
+++ b/examples/suspend/suspend.tesh
@@ -2,14 +2,10 @@
 
 ! output sort
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar suspend/Suspend ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/suspend/suspendDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 
 ! output sort
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar suspend/Suspend ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/suspend/suspendDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

-> [  0.000000] (0:@) Ready to run MSG_MAIN

 > [  0.000000] (1:suspend.DreamMaster@Jacquelin) Let's create a lazy guy.
 > [  0.000000] (1:suspend.DreamMaster@Jacquelin) Let's wait a little bit...
 > [  0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep.
 > [  0.000000] (1:suspend.DreamMaster@Jacquelin) Let's create a lazy guy.
 > [  0.000000] (1:suspend.DreamMaster@Jacquelin) Let's wait a little bit...
 > [  0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep.

-> [ 10.000000] (0:@) Done running MSG_MAIN
-> [ 10.000000] (0:@) MSG_main finished
-> [ 10.000000] (0:@) Clean java world
-> [ 10.000000] (0:@) Clean native world
+> [ 10.000000] (0:@) MSG_main finished; Cleaning up the simulation...

 > [ 10.000000] (1:suspend.DreamMaster@Jacquelin) Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!
 > [ 10.000000] (1:suspend.DreamMaster@Jacquelin) OK, goodbye now.
 > [ 10.000000] (2:Lazy@Jacquelin) Uuuh ? Did somebody call me ?
 > [ 10.000000] (1:suspend.DreamMaster@Jacquelin) Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!
 > [ 10.000000] (1:suspend.DreamMaster@Jacquelin) OK, goodbye now.
 > [ 10.000000] (2:Lazy@Jacquelin) Uuuh ? Did somebody call me ?

diff --git a/examples/tracing/tracingPingPong.tesh b/examples/tracing/tracingPingPong.tesh
index 850caa6..50b5660 100644 (file)
--- a/examples/tracing/tracingPingPong.tesh
+++ b/examples/tracing/tracingPingPong.tesh
@@ -4,14 +4,10 @@
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar tracing/TracingTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/tracing/tracingPingPongDeployment.xml --cfg=tracing:1  --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:1
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar tracing/TracingTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/tracing/tracingPingPongDeployment.xml --cfg=tracing:1  --cfg=tracing/filename:simulation.trace --cfg=tracing/platform:1
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.

-> [0.000000] [jmsg/INFO] Ready to run MSG_MAIN

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'simulation.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'simulation.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to '1'

-> [4.474433] [jmsg/INFO] Done running MSG_MAIN
-> [4.474433] [jmsg/INFO] MSG_main finished
-> [4.474433] [jmsg/INFO] Clean java world
-> [4.474433] [jmsg/INFO] Clean native world
+> [4.474433] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

 > [Boivin:tracing.Receiver:(2) 0.000000] [jmsg/INFO] hello!
 > [Boivin:tracing.Receiver:(2) 0.000000] [jmsg/INFO] try to get a task
 > [Boivin:tracing.Receiver:(2) 1.048890] [jmsg/INFO] Got at time 1.0488895059341703
 > [Boivin:tracing.Receiver:(2) 0.000000] [jmsg/INFO] hello!
 > [Boivin:tracing.Receiver:(2) 0.000000] [jmsg/INFO] try to get a task
 > [Boivin:tracing.Receiver:(2) 1.048890] [jmsg/INFO] Got at time 1.0488895059341703