From d3e7225dadcad644d2f4d4492e05a4d8341af887 Mon Sep 17 00:00:00 2001 From: Samuel Lepetit Date: Tue, 12 Jun 2012 11:49:13 +0200 Subject: [PATCH] Renamed basic example to "masterslave" (more accurate) --- CMakeLists.txt | 25 ++-- examples/async/AsyncTest.java | 21 ++-- examples/basic/basic.tesh | 35 ------ examples/basic/basicDeployment.xml | 49 -------- examples/basic/deploy.xml | 114 ------------------ .../{basic => masterslave}/FinalizeTask.java | 4 +- .../{basic => masterslave}/Forwarder.java | 2 +- examples/{basic => masterslave}/Master.java | 2 +- .../Masterslave.java} | 8 +- examples/{basic => masterslave}/README | 0 examples/{basic => masterslave}/Slave.java | 4 +- examples/masterslave/deploy.xml | 114 ++++++++++++++++++ examples/masterslave/masterslave.tesh | 35 ++++++ 13 files changed, 178 insertions(+), 235 deletions(-) delete mode 100644 examples/basic/basic.tesh delete mode 100644 examples/basic/basicDeployment.xml delete mode 100644 examples/basic/deploy.xml rename examples/{basic => masterslave}/FinalizeTask.java (93%) rename examples/{basic => masterslave}/Forwarder.java (98%) rename examples/{basic => masterslave}/Master.java (98%) rename examples/{basic/BasicTest.java => masterslave/Masterslave.java} (82%) rename examples/{basic => masterslave}/README (100%) rename examples/{basic => masterslave}/Slave.java (98%) create mode 100644 examples/masterslave/deploy.xml create mode 100644 examples/masterslave/masterslave.tesh diff --git a/CMakeLists.txt b/CMakeLists.txt index 12a9255194..7bd387210e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,13 +118,6 @@ set(JAVA_EXAMPLES examples/async/Forwarder.java examples/async/Master.java examples/async/Slave.java - examples/startKillTime/Slave.java - examples/basic/FinalizeTask.java - examples/basic/Forwarder.java - examples/basic/Master.java - examples/basic/BasicTest.java - examples/basic/Slave.java - examples/bittorrent/Bittorrent.java examples/bittorrent/Common.java examples/bittorrent/Connection.java @@ -144,6 +137,11 @@ set(JAVA_EXAMPLES examples/commTime/Master.java examples/commTime/Slave.java examples/commTime/CommTimeTest.java + examples/masterslave/FinalizeTask.java + examples/masterslave/Forwarder.java + examples/masterslave/Master.java + examples/masterslave/Masterslave.java + examples/masterslave/Slave.java examples/master_slave_bypass/Master.java examples/master_slave_bypass/MsBypass.java examples/master_slave_bypass/Slave.java @@ -163,6 +161,7 @@ set(JAVA_EXAMPLES examples/pingPong/Receiver.java examples/pingPong/PingPongTest.java examples/startKillTime/Master.java + examples/startKillTime/Slave.java examples/startKillTime/StartKillTime.java examples/suspend/DreamMaster.java examples/suspend/LazyGuy.java @@ -182,8 +181,8 @@ set(XML_FILES examples/mutualExclusion/centralized/mutex_centralized_deployment.xml examples/platform.xml examples/pingPong/pingPongDeployment.xml - examples/basic/basicDeployment.xml - examples/basic/deploy.xml + examples/masterslave/basicDeployment.xml + examples/masterslave/deploy.xml examples/master_slave_bypass/platform.xml examples/master_slave_kill/platform.xml examples/async/asyncDeployment.xml @@ -260,10 +259,10 @@ add_custom_command( OUTPUT ${JAVA_EXAMPLES_CLASS} DEPENDS ${JAVA_EXAMPLES} COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/async/*.java - COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/basic/*.java - COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/*.java COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/chord/*.java COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/commTime/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/masterslave/*.java COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/*.java COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/*.java COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java @@ -295,19 +294,19 @@ INCLUDE(CTest) ENABLE_TESTING() ADD_TEST(async ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/async/async.tesh) -ADD_TEST(basic ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/basic/basic.tesh) ADD_TEST(bittorrent ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/bittorrent.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(commTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh) ADD_TEST(chord ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/chord/chord.tesh) ADD_TEST(kill ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh) +ADD_TEST(masterslave ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/masterslave/masterslave.tesh) ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh) ADD_TEST(pingPong ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingpong.tesh) ADD_TEST(priority ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/priority/priority.tesh) ADD_TEST(startKillTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh) ADD_TEST(suspend ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/suspend/suspend.tesh) #Don't forget to put new test in this list!!! -set(test_list async basic bittorrent bypass chord commTime kill mutualExclusion pingPong priority startKillTime) +set(test_list async bittorrent bypass chord commTime kill masterslave mutualExclusion pingPong priority startKillTime) ########################################## # Set the DYLD_LIBRARY_PATH for mac # diff --git a/examples/async/AsyncTest.java b/examples/async/AsyncTest.java index 1e14632da9..f8abd3367e 100644 --- a/examples/async/AsyncTest.java +++ b/examples/async/AsyncTest.java @@ -22,23 +22,16 @@ public class AsyncTest { /* initialize the MSG simulation. Must be done before anything else (even logging). */ Msg.init(args); - if(args.length == 0) { - Msg.createEnvironment("async_platform.xml"); - Msg.deployApplication("async_deployment.xml"); - - } else if (args.length < 2) { - - + if (args.length < 2) { Msg.info("Usage : Async platform_file deployment_file"); - Msg.info("example : Async async_platform.xml async_deployment.xml"); - System.exit(1); - } else { - - /* construct the platform and deploy the application */ - Msg.createEnvironment(args[0]); - Msg.deployApplication(args[1]); + Msg.info("example : Async basic_platform.xml basic_deployment.xml"); + System.exit(1); } + /* construct the platform and deploy the application */ + Msg.createEnvironment(args[0]); + Msg.deployApplication(args[1]); + /* execute the simulation. */ Msg.run(); } diff --git a/examples/basic/basic.tesh b/examples/basic/basic.tesh deleted file mode 100644 index f05eba9c58..0000000000 --- a/examples/basic/basic.tesh +++ /dev/null @@ -1,35 +0,0 @@ -#! ./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/basic/basicDeployment.xml b/examples/basic/basicDeployment.xml deleted file mode 100644 index 7edfa6d0d0..0000000000 --- a/examples/basic/basicDeployment.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/basic/deploy.xml b/examples/basic/deploy.xml deleted file mode 100644 index f1351dca2d..0000000000 --- a/examples/basic/deploy.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/examples/basic/FinalizeTask.java b/examples/masterslave/FinalizeTask.java similarity index 93% rename from examples/basic/FinalizeTask.java rename to examples/masterslave/FinalizeTask.java index 7034e4ca00..c95e455485 100644 --- a/examples/basic/FinalizeTask.java +++ b/examples/masterslave/FinalizeTask.java @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ -package basic; +package masterslave; import org.simgrid.msg.Task; public class FinalizeTask extends Task { @@ -13,4 +13,4 @@ public class FinalizeTask extends Task { super("finalize",0,0); } } - \ No newline at end of file + diff --git a/examples/basic/Forwarder.java b/examples/masterslave/Forwarder.java similarity index 98% rename from examples/basic/Forwarder.java rename to examples/masterslave/Forwarder.java index e8faf39e5e..0c285ee4d0 100644 --- a/examples/basic/Forwarder.java +++ b/examples/masterslave/Forwarder.java @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ -package basic; +package masterslave; import org.simgrid.msg.Host; import org.simgrid.msg.Msg; diff --git a/examples/basic/Master.java b/examples/masterslave/Master.java similarity index 98% rename from examples/basic/Master.java rename to examples/masterslave/Master.java index dfb4a9b475..9d582cf8be 100644 --- a/examples/basic/Master.java +++ b/examples/masterslave/Master.java @@ -7,7 +7,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ -package basic; +package masterslave; import org.simgrid.msg.Host; import org.simgrid.msg.Msg; import org.simgrid.msg.MsgException; diff --git a/examples/basic/BasicTest.java b/examples/masterslave/Masterslave.java similarity index 82% rename from examples/basic/BasicTest.java rename to examples/masterslave/Masterslave.java index a37ff5da12..03acdc6b69 100644 --- a/examples/basic/BasicTest.java +++ b/examples/masterslave/Masterslave.java @@ -5,12 +5,12 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ -package basic; +package masterslave; import org.simgrid.msg.Msg; import org.simgrid.msg.NativeException; -public class BasicTest { +public class Masterslave { /* This only contains the launcher. If you do nothing more than than you can run * java simgrid.msg.Msg @@ -22,8 +22,8 @@ public class BasicTest { Msg.init(args); if (args.length < 2) { - Msg.info("Usage : Basic platform_file deployment_file"); - Msg.info("example : Basic basic_platform.xml basic_deployment.xml"); + Msg.info("Usage : Masterslave platform_file deployment_file"); + Msg.info("example : Masterslave basic_platform.xml basic_deployment.xml"); System.exit(1); } /* construct the platform and deploy the application */ diff --git a/examples/basic/README b/examples/masterslave/README similarity index 100% rename from examples/basic/README rename to examples/masterslave/README diff --git a/examples/basic/Slave.java b/examples/masterslave/Slave.java similarity index 98% rename from examples/basic/Slave.java rename to examples/masterslave/Slave.java index dc216a4d46..e72b76d30d 100644 --- a/examples/basic/Slave.java +++ b/examples/masterslave/Slave.java @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -package basic; +package masterslave; import org.simgrid.msg.Host; import org.simgrid.msg.HostFailureException; @@ -45,4 +45,4 @@ public class Slave extends Process { Msg.info("Received Finalize. I'm done. See you!"); } -} \ No newline at end of file +} diff --git a/examples/masterslave/deploy.xml b/examples/masterslave/deploy.xml new file mode 100644 index 0000000000..f72a8b9523 --- /dev/null +++ b/examples/masterslave/deploy.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + diff --git a/examples/masterslave/masterslave.tesh b/examples/masterslave/masterslave.tesh new file mode 100644 index 0000000000..b13ffaf143 --- /dev/null +++ b/examples/masterslave/masterslave.tesh @@ -0,0 +1,35 @@ +#! ./tesh + +! 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.851529] (2:masterslave.Forwarder@Jackson) Sending "Task_0" to "slave_7" +> [ 2.208640] (3:masterslave.Forwarder@Casavant) Sending "Task_1" to "slave_9" +> [ 2.720598] (11:masterslave.Slave@Sirois) Received "Task_1". Processing it. +> [ 3.554211] (9:masterslave.Slave@Stephen) Received "Task_0". Processing it. +> [ 5.252532] (4:masterslave.Slave@iRMX) Received "Task_2". Processing it. +> [ 6.267288] (5:masterslave.Slave@Bousquet) Received "Task_3". Processing it. +> [ 7.711085] (1:masterslave.Master@Jacquelin) All tasks have been dispatched. Let's tell everybody the computation is over. +> [ 7.711085] (6:masterslave.Slave@Soucy) Received "Task_4". Processing it. +> [ 8.562549] (2:masterslave.Forwarder@Jackson) Got a finalize task. Let's forward that we're done. +> [ 9.919556] (3:masterslave.Forwarder@Casavant) Got a finalize task. Let's forward that we're done. +> [ 10.431474] (11:masterslave.Slave@Sirois) Received Finalize. I'm done. See you! +> [ 11.265023] (9:masterslave.Slave@Stephen) Received Finalize. I'm done. See you! +> [ 11.318960] (12:masterslave.Slave@Monique) Received Finalize. I'm done. See you! +> [ 11.318960] (3:masterslave.Forwarder@Casavant) I'm done. See you! +> [ 12.963214] (4:masterslave.Slave@iRMX) Received Finalize. I'm done. See you! +> [ 13.908112] (10:masterslave.Slave@Robert) Received Finalize. I'm done. See you! +> [ 13.908112] (2:masterslave.Forwarder@Jackson) 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] (1:masterslave.Master@Jacquelin) Goodbye now! +> [ 17.252217] (8:masterslave.Slave@Browne) Received Finalize. I'm done. See you! -- 2.20.1