Used of tesh for test.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86c1853..086cdfb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,27 +265,13 @@ ${CMAKE_HOME_DIRECTORY}/simgrid.jar
 INCLUDE(CTest)
 ENABLE_TESTING()
 
-ADD_TEST(basic
-java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar basic/BasicTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/basic/basicDeployment.xml
-)
-ADD_TEST(async
-java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar async/AsyncTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/async/asyncDeployment.xml
-)
-ADD_TEST(pingPong
-java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar pingPong/PingPongTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingPongDeployment.xml
-)
-ADD_TEST(CommTime
-java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar commTime/CommTimeTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/commTime/commTimeDeployment.xml
-)
-ADD_TEST(mutualExclusion
-java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar mutualExclusion/centralized/MutexCentral ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/ring3.xml ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml
-)
-ADD_TEST(bypass
-java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar master_slave_bypass/MsBypass ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/platform.xml
-)
-ADD_TEST(kill
-java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar master_slave_kill/MsKill ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/platform.xml
-)
+ADD_TEST(basic           ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/basic/basic.tesh)
+ADD_TEST(async           ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/async/async.tesh)
+ADD_TEST(pingPong        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingpong.tesh)
+ADD_TEST(CommTime        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh)
+ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh)
+ADD_TEST(bypass          ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/bypass.tesh)
+ADD_TEST(kill            ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh)
 #Don't forget to put new test in this list!!!
 set(test_list basic async pingPong CommTime mutualExclusion bypass kill)
 

diff --git a/FindSimGrid.cmake b/FindSimGrid.cmake
index 168c9c9..a77a88d 100644 (file)
--- a/FindSimGrid.cmake
+++ b/FindSimGrid.cmake
@@ -14,6 +14,13 @@ find_path(SIMGRID_INCLUDES msg/msg.h
     PATH_SUFFIXES include
 )
 
+find_program(TESH_BIN_PATH
+       NAMES tesh
+       HINTS
+       $ENV{SIMGRID_ROOT}
+       PATH_SUFFIXES bin
+)
+
 message(STATUS "Looking for lib SimGrid")
 if(SIMGRID_LIB)
   message(STATUS "Looking for lib SimGrid - found")  
@@ -44,4 +51,8 @@ endif(SIMGRID_INCLUDES)
 if(SIMGRID_LIB AND SIMGRID_INCLUDES)
 else(SIMGRID_LIB AND SIMGRID_INCLUDES)
     message(FATAL_ERROR "Unable to find both the library and the include files. Setting the environment variable SIMGRID_ROOT may help.")
-endif(SIMGRID_LIB AND SIMGRID_INCLUDES)
\ No newline at end of file
+endif(SIMGRID_LIB AND SIMGRID_INCLUDES)
+
+if(TESH_BIN_PATH)
+message(STATUS "Found Tesh: ${TESH_BIN_PATH}")
+endif(TESH_BIN_PATH)
\ No newline at end of file

diff --git a/examples/async/async.tesh b/examples/async/async.tesh
new file mode 100644 (file)
index 0000000..6adfdd5
--- /dev/null
+++ b/examples/async/async.tesh
@@ -0,0 +1,59 @@
+#! ./tesh
+
+! 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] (1:async.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process
+> [  0.000000] (1:async.Master@Jacquelin) Sending "Task_0" to "slave_0"
+> [  0.000000] (1:async.Master@Jacquelin) Sending "Task_1" to "slave_1"
+> [  0.000000] (1:async.Master@Jacquelin) Sending "Task_2" to "slave_2"
+> [  0.000000] (1:async.Master@Jacquelin) Sending "Task_3" to "slave_3"
+> [  0.000000] (1:async.Master@Jacquelin) Sending "Task_4" to "slave_4"
+> [  0.000000] (2:async.Forwarder@Jackson) Receiving on 'slave_0'
+> [  0.000000] (3:async.Forwarder@Casavant) Receiving on 'slave_1'
+> [  0.000000] (4:async.Slave@iRMX) Receiving on 'slave_2'
+> [  0.000000] (5:async.Slave@Bousquet) Receiving on 'slave_3'
+> [  0.000000] (6:async.Slave@Soucy) Receiving on 'slave_4'
+> [  0.000000] (7:async.Slave@Kuenning) Receiving on 'slave_5'
+> [  0.000000] (8:async.Slave@Browne) Receiving on 'slave_6'
+> [  0.000000] (9:async.Slave@Stephen) Receiving on 'slave_7'
+> [  0.851529] (2:async.Forwarder@Jackson) Sending "Task_0" to "slave_7"
+> [  1.357112] (3:async.Forwarder@Casavant) Sending "Task_1" to "slave_9"
+> [  2.000000] (11:async.Slave@Sirois) Received a task
+> [  2.000000] (11:async.Slave@Sirois) Received "Task_1". Processing it.
+> [  2.000000] (5:async.Slave@Bousquet) Received a task
+> [  2.000000] (5:async.Slave@Bousquet) Received "Task_3". Processing it.
+> [  2.000000] (6:async.Slave@Soucy) Received a task
+> [  2.000000] (6:async.Slave@Soucy) Received "Task_4". Processing it.
+> [  2.000364] (6:async.Slave@Soucy) Receiving on 'slave_4'
+> [  2.000437] (11:async.Slave@Sirois) Receiving on 'slave_9'
+> [  2.001165] (5:async.Slave@Bousquet) Receiving on 'slave_3'
+> [  4.000000] (4:async.Slave@iRMX) Received a task
+> [  4.000000] (4:async.Slave@iRMX) Received "Task_2". Processing it.
+> [  4.000000] (9:async.Slave@Stephen) Received a task
+> [  4.000000] (9:async.Slave@Stephen) Received "Task_0". Processing it.
+> [  4.000728] (4:async.Slave@iRMX) Receiving on 'slave_2'
+> [  4.000728] (9:async.Slave@Stephen) Receiving on 'slave_7'
+> [  5.000000] (1:async.Master@Jacquelin) All tasks have been dispatched. Let's tell (asynchronously) everybody the computation is over, and sleep 20s so that nobody gets a message from a terminated process.
+> [  5.851463] (2:async.Forwarder@Jackson) Got a finalize task. Let's forward (asynchronously) that we're done, and then sleep 20 seconds so that nobody gets a message from a terminated process.
+> [  6.000000] (7:async.Slave@Kuenning) Received Finalize. I'm done. See you!
+> [  6.000000] (8:async.Slave@Browne) Received Finalize. I'm done. See you!
+> [  6.357007] (3:async.Forwarder@Casavant) Got a finalize task. Let's forward (asynchronously) that we're done, and then sleep 20 seconds so that nobody gets a message from a terminated process.
+> [  7.000364] (6:async.Slave@Soucy) Received Finalize. I'm done. See you!
+> [  7.000437] (11:async.Slave@Sirois) Received Finalize. I'm done. See you!
+> [  7.001165] (5:async.Slave@Bousquet) Received Finalize. I'm done. See you!
+> [  8.000000] (12:async.Slave@Monique) Received Finalize. I'm done. See you!
+> [  9.000000] (10:async.Slave@Robert) Received Finalize. I'm done. See you!
+> [  9.000728] (4:async.Slave@iRMX) Received Finalize. I'm done. See you!
+> [  9.000728] (9:async.Slave@Stephen) Received Finalize. 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

diff --git a/examples/basic/basic.tesh b/examples/basic/basic.tesh
new file mode 100644 (file)
index 0000000..f05eba9
--- /dev/null
+++ b/examples/basic/basic.tesh
@@ -0,0 +1,35 @@
+#! ./tesh
+
+! output sort
+
+$ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar basic/BasicTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/basic/basicDeployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:@) Ready to run MSG_MAIN
+> [  0.000000] (1:basic.Master@Jacquelin) Hello! Got 7 slaves and 5 tasks to process
+> [  0.000000] (2:basic.Forwarder@Jackson) Receiving on 'slave_0'
+> [  0.000000] (3:basic.Forwarder@Casavant) Receiving on 'slave_1'
+> [  0.851529] (2:basic.Forwarder@Jackson) Sending "Task_0" to "slave_7"
+> [  2.208640] (3:basic.Forwarder@Casavant) Sending "Task_1" to "slave_9"
+> [  2.720598] (11:basic.Slave@Sirois) Received "Task_1". Processing it.
+> [  3.554211] (9:basic.Slave@Stephen) Received "Task_0". Processing it.
+> [  5.252532] (4:basic.Slave@iRMX) Received "Task_2". Processing it.
+> [  6.267288] (5:basic.Slave@Bousquet) Received "Task_3". Processing it.
+> [  7.711085] (1:basic.Master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over.
+> [  7.711085] (6:basic.Slave@Soucy) Received "Task_4". Processing it.
+> [  8.562549] (2:basic.Forwarder@Jackson) Got a finalize task. Let's forward that we're done.
+> [  9.919556] (3:basic.Forwarder@Casavant) Got a finalize task. Let's forward that we're done.
+> [ 10.431474] (11:basic.Slave@Sirois) Received Finalize. I'm done. See you!
+> [ 11.265023] (9:basic.Slave@Stephen) Received Finalize. I'm done. See you!
+> [ 11.318960] (12:basic.Slave@Monique) Received Finalize. I'm done. See you!
+> [ 11.318960] (3:basic.Forwarder@Casavant) I'm done. See you!
+> [ 12.963214] (4:basic.Slave@iRMX) Received Finalize. I'm done. See you!
+> [ 13.908112] (10:basic.Slave@Robert) Received Finalize. I'm done. See you!
+> [ 13.908112] (2:basic.Forwarder@Jackson) I'm done. See you!
+> [ 13.977892] (5:basic.Slave@Bousquet) Received Finalize. I'm done. See you!
+> [ 15.421578] (6:basic.Slave@Soucy) Received Finalize. I'm done. See you!
+> [ 16.278886] (7:basic.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] (1:basic.Master@Jacquelin) Goodbye now!
+> [ 17.252217] (8:basic.Slave@Browne) Received Finalize. I'm done. See you!
\ No newline at end of file

diff --git a/examples/commTime/commtime.tesh b/examples/commTime/commtime.tesh
new file mode 100644 (file)
index 0000000..881c794
--- /dev/null
+++ b/examples/commTime/commtime.tesh
@@ -0,0 +1,60 @@
+#! ./tesh
+
+! output sort
+
+$ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar commTime/CommTimeTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/commTime/commTimeDeployment.xml
+> [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
+> [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'
+> [Boucherville:commTime.Slave:(18) 7011.996120] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Bousquet:commTime.Slave:(3) 0.000000] [jmsg/INFO] Receiving on 'slave_1'
+> [Bousquet:commTime.Slave:(3) 6991.653693] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Casavant:commTime.Slave:(5) 0.000000] [jmsg/INFO] Receiving on 'slave_3'
+> [Casavant:commTime.Slave:(5) 6994.454386] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Disney:commTime.Slave:(8) 0.000000] [jmsg/INFO] Receiving on 'slave_6'
+> [Disney:commTime.Slave:(8) 6997.134727] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Ethernet:commTime.Slave:(14) 0.000000] [jmsg/INFO] Receiving on 'slave_12'
+> [Ethernet:commTime.Slave:(14) 7005.013415] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Gatien:commTime.Slave:(10) 0.000000] [jmsg/INFO] Receiving on 'slave_8'
+> [Gatien:commTime.Slave:(10) 6999.297516] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Geoff:commTime.Slave:(7) 0.000000] [jmsg/INFO] Receiving on 'slave_5'
+> [Geoff:commTime.Slave:(7) 6995.311190] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Harry:commTime.Slave:(16) 0.000000] [jmsg/INFO] Receiving on 'slave_14'
+> [Harry:commTime.Slave:(16) 7008.661701] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Jackson:commTime.Slave:(6) 0.000000] [jmsg/INFO] Receiving on 'slave_4'
+> [Jackson:commTime.Slave:(6) 6995.305849] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Jacquelin:commTime.Master:(1) 0.000000] [jmsg/INFO] Hello! Got 21 slaves and 5000 tasks to process
+> [Jacquelin:commTime.Master:(1) 0.000000] [jmsg/INFO] Sending "Task_0" to "slave_0"
+> [Jacquelin:commTime.Master:(1) 1396.521188] [jmsg/INFO] Sending "Task_1000" to "slave_13"
+> [Jacquelin:commTime.Master:(1) 2795.257251] [jmsg/INFO] Sending "Task_2000" to "slave_5"
+> [Jacquelin:commTime.Master:(1) 4192.904226] [jmsg/INFO] Sending "Task_3000" to "slave_18"
+> [Jacquelin:commTime.Master:(1) 5588.596170] [jmsg/INFO] Sending "Task_4000" to "slave_10"
+> [Jacquelin:commTime.Master:(1) 6987.595357] [jmsg/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
+> [Jacquelin:commTime.Master:(1) 7016.935689] [jmsg/INFO] Goodbye now!
+> [Kansas:commTime.Slave:(20) 0.000000] [jmsg/INFO] Receiving on 'slave_18'
+> [Kansas:commTime.Slave:(20) 7014.741705] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [King:commTime.Slave:(21) 0.000000] [jmsg/INFO] Receiving on 'slave_19'
+> [King:commTime.Slave:(21) 7015.593510] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Lapointe:commTime.Slave:(22) 0.000000] [jmsg/INFO] Receiving on 'slave_20'
+> [Lapointe:commTime.Slave:(22) 7016.935689] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Laroche:commTime.Slave:(11) 0.000000] [jmsg/INFO] Receiving on 'slave_9'
+> [Laroche:commTime.Slave:(11) 7001.098154] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [McGee:commTime.Slave:(9) 0.000000] [jmsg/INFO] Receiving on 'slave_7'
+> [McGee:commTime.Slave:(9) 6998.023079] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Morin:commTime.Slave:(13) 0.000000] [jmsg/INFO] Receiving on 'slave_11'
+> [Morin:commTime.Slave:(13) 7003.953218] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Olivier:commTime.Slave:(17) 0.000000] [jmsg/INFO] Receiving on 'slave_15'
+> [Olivier:commTime.Slave:(17) 7010.097107] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Pointe_Claire:commTime.Slave:(19) 0.000000] [jmsg/INFO] Receiving on 'slave_17'
+> [Pointe_Claire:commTime.Slave:(19) 7013.849609] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Soucy:commTime.Slave:(4) 0.000000] [jmsg/INFO] Receiving on 'slave_2'
+> [Soucy:commTime.Slave:(4) 6993.097379] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [Tanguay:commTime.Slave:(12) 0.000000] [jmsg/INFO] Receiving on 'slave_10'
+> [Tanguay:commTime.Slave:(12) 7002.088986] [jmsg/INFO] Received Finalize. I'm done. See you!
+> [iRMX:commTime.Slave:(2) 0.000000] [jmsg/INFO] Receiving on 'slave_0'
+> [iRMX:commTime.Slave:(2) 6990.639014] [jmsg/INFO] Received Finalize. I'm done. See you!

diff --git a/examples/master_slave_bypass/bypass.tesh b/examples/master_slave_bypass/bypass.tesh
new file mode 100644 (file)
index 0000000..c9ba244
--- /dev/null
+++ b/examples/master_slave_bypass/bypass.tesh
@@ -0,0 +1,15 @@
+#! ./tesh
+
+! output sort
+
+$ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar master_slave_bypass/MsBypass ${srcdir:=.}/examples/master_slave_bypass/platform.xml
+> [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
+> [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!
+> [bob:process1:(1) 0.000000] [jmsg/INFO] Create process on host 'alice'
+> [bob:process1:(1) 0.013010] [jmsg/INFO] Received Finalize. I'm done. See you!

diff --git a/examples/master_slave_kill/kill.tesh b/examples/master_slave_kill/kill.tesh
new file mode 100644 (file)
index 0000000..ec4c84d
--- /dev/null
+++ b/examples/master_slave_kill/kill.tesh
@@ -0,0 +1,19 @@
+#! ./tesh
+
+! output sort
+
+$ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar master_slave_kill/MsKill ${srcdir:=.}/examples/master_slave_kill/platform.xml
+> Thread-1: I ignore that other exception
+> [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]  Process slave has been killed.
+> [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!
+> [bob:master:(1) 0.000000] [jmsg/INFO] Create process on host 'alice'
+> [bob:master:(1) 0.013010] [jmsg/INFO] Received mail1!
+> [bob:master:(1) 0.013010] [jmsg/INFO] Process slave will be killed.
+> [bob:master:(1) 0.013010] [jmsg/INFO] Process2 is now killed, should exit now

diff --git a/examples/mutualExclusion/mutualexclusion.tesh b/examples/mutualExclusion/mutualexclusion.tesh
new file mode 100644 (file)
index 0000000..a4e4ec8
--- /dev/null
+++ b/examples/mutualExclusion/mutualexclusion.tesh
@@ -0,0 +1,20 @@
+#! ./tesh
+
+! output sort
+
+$ 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] /home/navarro/workspace/simgrid/src/surf/surfxml_parse.c:40: [surf_parse/WARNING] /home/navarro/workspace/simgrid-java/examples/mutualExclusion/ring3.xml:23: Ignoring the identical redefinition of the route between "Host 1" and "Host 0"
+> [0.000000] /home/navarro/workspace/simgrid/src/surf/surfxml_parse.c:40: [surf_parse/WARNING] /home/navarro/workspace/simgrid-java/examples/mutualExclusion/ring3.xml:31: Ignoring the identical redefinition of the route between "Host 2" and "Host 0"
+> [0.000000] /home/navarro/workspace/simgrid/src/surf/surfxml_parse.c:40: [surf_parse/WARNING] /home/navarro/workspace/simgrid-java/examples/mutualExclusion/ring3.xml:35: Ignoring the identical redefinition of the route between "Host 2" and "Host 1"
+> [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
+> [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 1:mutualExclusion.centralized.Node:(2) 0.000000] [jmsg/INFO] Send a request to the coordinator
+> [Host 1:mutualExclusion.centralized.Node:(2) 0.001301] [jmsg/INFO] Wait for a grant from the coordinator
+> [Host 2:mutualExclusion.centralized.Node:(3) 0.000000] [jmsg/INFO] Send a request to the coordinator
+> [Host 2:mutualExclusion.centralized.Node:(3) 0.003903] [jmsg/INFO] Wait for a grant from the coordinator
\ No newline at end of file

diff --git a/examples/pingPong/pingpong.tesh b/examples/pingPong/pingpong.tesh
new file mode 100644 (file)
index 0000000..0f58fdd
--- /dev/null
+++ b/examples/pingPong/pingpong.tesh
@@ -0,0 +1,21 @@
+#! ./tesh
+
+! output sort
+
+$ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar pingPong/PingPongTest ${srcdir:=.}/examples/platform.xml ${srcdir:=.}/examples/pingPong/pingPongDeployment.xml
+> [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
+> [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) 1.048890] [jmsg/INFO] Was sent at time 0.0
+> [Boivin:pingPong.Receiver:(2) 1.048890] [jmsg/INFO] Communication time : 1.0488895059341703
+> [Boivin:pingPong.Receiver:(2) 1.048890] [jmsg/INFO]  --- bw 9.533892696441577E7 ----
+> [Boivin:pingPong.Receiver:(2) 1.048890] [jmsg/INFO] goodbye!
+> [Jacquelin:pingPong.Sender:(1) 0.000000] [jmsg/INFO] hello!
+> [Jacquelin:pingPong.Sender:(1) 0.000000] [jmsg/INFO] host count: 1
+> [Jacquelin:pingPong.Sender:(1) 0.000000] [jmsg/INFO] sender time: 0.0
+> [Jacquelin:pingPong.Sender:(1) 1.048890] [jmsg/INFO] goodbye!
\ No newline at end of file

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index 647b34e..622e103 100644 (file)
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -111,7 +111,7 @@ void smx_ctx_java_stop(smx_context_t context)
   /* suspend myself again, smx_ctx_java_free() will destroy me later
    * from maeastro */
   jprocess_unschedule(context);
-  XBT_INFO("Java stop finished");
+  XBT_DEBUG("Java stop finished");
 }
 
 static void smx_ctx_java_suspend(smx_context_t context)