From: alegrand Date: Thu, 2 Dec 2010 22:24:28 +0000 (+0000) Subject: Add a simple exemple and test of multicore machine. X-Git-Tag: v3.6_beta2~977 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ed74eb58c1a3d7314defa30f0416d51bc8130336 Add a simple exemple and test of multicore machine. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8940 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 14be4ea11d..a0d654342a 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -131,6 +131,7 @@ ADD_TEST(msg-masterslave-failure ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_ ADD_TEST(msg-masterslave-bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_bypass.tesh) ADD_TEST(msg-masterslave-mailbox ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_mailbox.tesh) ADD_TEST(msg-masterslave-vivaldi ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_vivaldi.tesh) +ADD_TEST(msg-masterslave-multicore ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_multicore.tesh) ADD_TEST(msg-migration ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg migration/migration.tesh) ADD_TEST(msg-ptask ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg parallel_task/parallel_task.tesh) ADD_TEST(msg-priority ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg priority/priority.tesh) diff --git a/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml b/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml new file mode 100644 index 0000000000..fc11b15f8f --- /dev/null +++ b/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/msg/masterslave/masterslave_multicore.tesh b/examples/msg/masterslave/masterslave_multicore.tesh new file mode 100644 index 0000000000..8515d8c8b1 --- /dev/null +++ b/examples/msg/masterslave/masterslave_multicore.tesh @@ -0,0 +1,36 @@ +#! ./tesh + +p Testing a simple master/slave example application + +$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox ../platforms/multicore_machine.xml ./masterslave/deployment_masterslave_mailbox_multicore.xml --cfg=cpu/model:Cas01_fullupdate +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01_fullupdate' +> [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s) +> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 6 slaves and 20 tasks to process +> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 0.002164] [msg_test/INFO] Sending "Task_1" (of 20) to mailbox "slave-1" +> [Tremblay:master:(1) 0.004328] [msg_test/INFO] Sending "Task_2" (of 20) to mailbox "slave-2" +> [Tremblay:master:(1) 0.006492] [msg_test/INFO] Sending "Task_3" (of 20) to mailbox "slave-3" +> [Tremblay:master:(1) 0.008656] [msg_test/INFO] Sending "Task_4" (of 20) to mailbox "slave-4" +> [Tremblay:master:(1) 0.010820] [msg_test/INFO] Sending "Task_5" (of 20) to mailbox "slave-5" +> [Tremblay:master:(1) 0.012984] [msg_test/INFO] Sending "Task_6" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 0.514038] [msg_test/INFO] Sending "Task_7" (of 20) to mailbox "slave-1" +> [Tremblay:master:(1) 0.516202] [msg_test/INFO] Sending "Task_8" (of 20) to mailbox "slave-2" +> [Tremblay:master:(1) 0.518366] [msg_test/INFO] Sending "Task_9" (of 20) to mailbox "slave-3" +> [Tremblay:master:(1) 0.520530] [msg_test/INFO] Sending "Task_10" (of 20) to mailbox "slave-4" +> [Tremblay:master:(1) 0.522694] [msg_test/INFO] Sending "Task_11" (of 20) to mailbox "slave-5" +> [Tremblay:master:(1) 0.524858] [msg_test/INFO] Sending "Task_12" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 1.025912] [msg_test/INFO] Sending "Task_13" (of 20) to mailbox "slave-1" +> [Tremblay:master:(1) 1.028076] [msg_test/INFO] Sending "Task_14" (of 20) to mailbox "slave-2" +> [Tremblay:master:(1) 1.030240] [msg_test/INFO] Sending "Task_15" (of 20) to mailbox "slave-3" +> [Tremblay:master:(1) 1.032404] [msg_test/INFO] Sending "Task_16" (of 20) to mailbox "slave-4" +> [Tremblay:master:(1) 1.034568] [msg_test/INFO] Sending "Task_17" (of 20) to mailbox "slave-5" +> [Tremblay:master:(1) 1.036732] [msg_test/INFO] Sending "Task_18" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 1.537786] [msg_test/INFO] Sending "Task_19" (of 20) to mailbox "slave-1" +> [Tremblay:master:(1) 1.539950] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over. +> [Tremblay:slave:(2) 2.047652] [msg_test/INFO] I'm done. See you! +> [Tremblay:slave:(3) 2.049816] [msg_test/INFO] I'm done. See you! +> [Tremblay:slave:(4) 2.049972] [msg_test/INFO] I'm done. See you! +> [Tremblay:slave:(5) 2.050128] [msg_test/INFO] I'm done. See you! +> [Tremblay:slave:(6) 2.050284] [msg_test/INFO] I'm done. See you! +> [Tremblay:slave:(7) 2.050440] [msg_test/INFO] I'm done. See you! +> [2.050440] [msg_test/INFO] Simulation time 2.05044 diff --git a/examples/platforms/multicore_machine.xml b/examples/platforms/multicore_machine.xml new file mode 100644 index 0000000000..0c9011cf06 --- /dev/null +++ b/examples/platforms/multicore_machine.xml @@ -0,0 +1,7 @@ + + + + + + +