Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / examples / java / app / masterworker / app_masterworker.tesh

diff --git a/examples/java/app/masterworker/app_masterworker.tesh b/examples/java/app/masterworker/app_masterworker.tesh
index be6140e..e2fcf87 100644 (file)
--- a/examples/java/app/masterworker/app_masterworker.tesh
+++ b/examples/java/app/masterworker/app_masterworker.tesh
@@ -1,23 +1,20 @@
 #! tesh
 
-! output sort 19
-
-$ java -classpath ${classpath:=.} app/masterworker/Main ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/app/masterworker/masterworker.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ java -classpath ${classpath:=.} app/masterworker/Main ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/app/masterworker/masterworker.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:app.masterworker.Master@Jacquelin) Hello! Got 7 workers and 5 tasks to process
-> [  3.043675] (2:app.masterworker.Worker@iRMX) Received "Task_0". Processing it.
-> [  4.058373] (3:app.masterworker.Worker@Bousquet) Received "Task_1". Processing it.
-> [  5.502067] (4:app.masterworker.Worker@Soucy) Received "Task_2". Processing it.
-> [  6.359383] (5:app.masterworker.Worker@Kuenning) Received "Task_3". Processing it.
-> [  7.332717] (1:app.masterworker.Master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over.
-> [  7.332717] (6:app.masterworker.Worker@Browne) Received "Task_4". Processing it.
-> [ 10.376375] (2:app.masterworker.Worker@iRMX) Received Finalize. I'm done. See you!
-> [ 11.391053] (3:app.masterworker.Worker@Bousquet) Received Finalize. I'm done. See you!
-> [ 12.834740] (4:app.masterworker.Worker@Soucy) Received Finalize. I'm done. See you!
-> [ 13.692048] (5:app.masterworker.Worker@Kuenning) Received Finalize. I'm done. See you!
-> [ 14.665378] (6:app.masterworker.Worker@Browne) Received Finalize. I'm done. See you!
-> [ 16.536717] (7:app.masterworker.Worker@Stephen) Received Finalize. I'm done. See you!
-> [ 18.348671] (0:maestro@) MSG_main finished; Cleaning up the simulation...
-> [ 18.348671] (1:app.masterworker.Master@Jacquelin) Goodbye now!
-> [ 18.348671] (8:app.masterworker.Worker@Robert) Received Finalize. I'm done. See you!
-
+> [  0.860026] (2:app.masterworker.Worker@Tremblay) Received "Task_0". Processing it.
+> [  1.752187] (3:app.masterworker.Worker@Fafard) Received "Task_1". Processing it.
+> [  1.757531] (4:app.masterworker.Worker@Bourassa) Received "Task_2". Processing it.
+> [  2.806417] (5:app.masterworker.Worker@Boivin) Received "Task_3". Processing it.
+> [  2.811761] (6:app.masterworker.Worker@Ginette) Received "Task_4". Processing it.
+> [  2.811761] (1:app.masterworker.Master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over.
+> [  3.671783] (2:app.masterworker.Worker@Tremblay) Received Finalize. I'm done. See you!
+> [  4.563940] (3:app.masterworker.Worker@Fafard) Received Finalize. I'm done. See you!
+> [  4.569280] (4:app.masterworker.Worker@Bourassa) Received Finalize. I'm done. See you!
+> [  5.618161] (5:app.masterworker.Worker@Boivin) Received Finalize. I'm done. See you!
+> [  5.623501] (6:app.masterworker.Worker@Ginette) Received Finalize. I'm done. See you!
+> [  5.628842] (7:app.masterworker.Worker@Jupiter) Received Finalize. I'm done. See you!
+> [  5.629037] (8:app.masterworker.Worker@Jacquelin) Received Finalize. I'm done. See you!
+> [  5.629037] (1:app.masterworker.Master@Jacquelin) Goodbye now!
+> [  5.629037] (0:maestro@) MSG_main finished; Cleaning up the simulation...