From: Paul Bédaride Date: Fri, 11 Jan 2013 15:00:27 +0000 (+0100) Subject: Fix lua tesh and remove msg_lua_masterslave test X-Git-Tag: v3_9_rc1~86^2~20 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/868e0f3359e8a2a890dc88637dfa699dbcb5c24c Fix lua tesh and remove msg_lua_masterslave test --- diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 91ce3681b5..215ef125cf 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -313,7 +313,6 @@ if(NOT enable_memcheck) ADD_TEST(lua-masterslave ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/masterslave master_slave.tesh) ADD_TEST(lua-mult-matrix ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/multi_matrix mult_matrix.tesh) ADD_TEST(lua-masterslave-bypass ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console master_slave_bypass.tesh) - ADD_TEST(lua-msg-masterslave-console ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_console.tesh) ADD_TEST(lua-chord ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord chord.tesh) ADD_TEST(lua-bittorrent ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/bittorrent bittorrent.tesh) ADD_TEST(lua-kademlia ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/kademlia kademlia.tesh) @@ -322,7 +321,6 @@ if(NOT enable_memcheck) set_tests_properties(lua-masterslave PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-mult-matrix PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-masterslave-bypass PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") - set_tests_properties(lua-msg-masterslave-console PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-chord PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-bittorrent PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-kademlia PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") diff --git a/examples/lua/console/master_slave_bypass.tesh b/examples/lua/console/master_slave_bypass.tesh index 684ce4b859..7b5044df93 100644 --- a/examples/lua/console/master_slave_bypass.tesh +++ b/examples/lua/console/master_slave_bypass.tesh @@ -12,97 +12,97 @@ $ lua master_slave_bypass.lua --log=surf_parse.thres:critical > [Fafard:Slave:(3) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 2 > [Ginette:Slave:(4) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 3 > [Bourassa:Slave:(5) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 0 -> [Jupiter:Slave:(2) 9.634668] [lua/INFO] Slave 'slave 1' processing Task 1 -> [Tremblay:Master:(1) 9.634668] [lua/INFO] Master done sending 'Task 1' To 'slave 1' -> [Tremblay:Master:(1) 9.634668] [lua/INFO] Master sending 'Task 2' To 'slave 2' -> [Jupiter:Slave:(2) 16.843434] [lua/INFO] Slave 'slave 1': task Task 1 done -> [Fafard:Slave:(3) 182.700276] [lua/INFO] Slave 'slave 2' processing Task 2 -> [Tremblay:Master:(1) 182.700276] [lua/INFO] Master done sending 'Task 2' To 'slave 2' -> [Tremblay:Master:(1) 182.700276] [lua/INFO] Master sending 'Task 3' To 'slave 3' -> [Fafard:Slave:(3) 189.909042] [lua/INFO] Slave 'slave 2': task Task 2 done -> [Ginette:Slave:(4) 298.047481] [lua/INFO] Slave 'slave 3' processing Task 3 -> [Tremblay:Master:(1) 298.047481] [lua/INFO] Master done sending 'Task 3' To 'slave 3' -> [Tremblay:Master:(1) 298.047481] [lua/INFO] Master sending 'Task 4' To 'slave 0' -> [Ginette:Slave:(4) 309.389558] [lua/INFO] Slave 'slave 3': task Task 3 done -> [Bourassa:Slave:(5) 519.166957] [lua/INFO] Slave 'slave 0' processing Task 4 -> [Tremblay:Master:(1) 519.166957] [lua/INFO] Master done sending 'Task 4' To 'slave 0' -> [Tremblay:Master:(1) 519.166957] [lua/INFO] Master sending 'Task 5' To 'slave 1' -> [Jupiter:Slave:(2) 528.801625] [lua/INFO] Slave 'slave 1' processing Task 5 -> [Tremblay:Master:(1) 528.801625] [lua/INFO] Master done sending 'Task 5' To 'slave 1' -> [Tremblay:Master:(1) 528.801625] [lua/INFO] Master sending 'Task 6' To 'slave 2' -> [Bourassa:Slave:(5) 530.509034] [lua/INFO] Slave 'slave 0': task Task 4 done -> [Jupiter:Slave:(2) 536.010391] [lua/INFO] Slave 'slave 1': task Task 5 done -> [Fafard:Slave:(3) 701.867233] [lua/INFO] Slave 'slave 2' processing Task 6 -> [Tremblay:Master:(1) 701.867233] [lua/INFO] Master done sending 'Task 6' To 'slave 2' -> [Tremblay:Master:(1) 701.867233] [lua/INFO] Master sending 'Task 7' To 'slave 3' -> [Fafard:Slave:(3) 709.075999] [lua/INFO] Slave 'slave 2': task Task 6 done -> [Ginette:Slave:(4) 817.214438] [lua/INFO] Slave 'slave 3' processing Task 7 -> [Tremblay:Master:(1) 817.214438] [lua/INFO] Master done sending 'Task 7' To 'slave 3' -> [Tremblay:Master:(1) 817.214438] [lua/INFO] Master sending 'Task 8' To 'slave 0' -> [Ginette:Slave:(4) 828.556515] [lua/INFO] Slave 'slave 3': task Task 7 done -> [Bourassa:Slave:(5) 1038.333914] [lua/INFO] Slave 'slave 0' processing Task 8 -> [Tremblay:Master:(1) 1038.333914] [lua/INFO] Master done sending 'Task 8' To 'slave 0' -> [Tremblay:Master:(1) 1038.333914] [lua/INFO] Master sending 'Task 9' To 'slave 1' -> [Jupiter:Slave:(2) 1047.968582] [lua/INFO] Slave 'slave 1' processing Task 9 -> [Tremblay:Master:(1) 1047.968582] [lua/INFO] Master done sending 'Task 9' To 'slave 1' -> [Tremblay:Master:(1) 1047.968582] [lua/INFO] Master sending 'Task 10' To 'slave 2' -> [Bourassa:Slave:(5) 1049.675991] [lua/INFO] Slave 'slave 0': task Task 8 done -> [Jupiter:Slave:(2) 1055.177348] [lua/INFO] Slave 'slave 1': task Task 9 done -> [Fafard:Slave:(3) 1221.034190] [lua/INFO] Slave 'slave 2' processing Task 10 -> [Tremblay:Master:(1) 1221.034190] [lua/INFO] Master done sending 'Task 10' To 'slave 2' -> [Tremblay:Master:(1) 1221.034190] [lua/INFO] Master sending 'Task 11' To 'slave 3' -> [Fafard:Slave:(3) 1228.242956] [lua/INFO] Slave 'slave 2': task Task 10 done -> [Ginette:Slave:(4) 1336.381395] [lua/INFO] Slave 'slave 3' processing Task 11 -> [Tremblay:Master:(1) 1336.381395] [lua/INFO] Master done sending 'Task 11' To 'slave 3' -> [Tremblay:Master:(1) 1336.381395] [lua/INFO] Master sending 'Task 12' To 'slave 0' -> [Ginette:Slave:(4) 1347.723472] [lua/INFO] Slave 'slave 3': task Task 11 done -> [Bourassa:Slave:(5) 1557.500871] [lua/INFO] Slave 'slave 0' processing Task 12 -> [Tremblay:Master:(1) 1557.500871] [lua/INFO] Master done sending 'Task 12' To 'slave 0' -> [Tremblay:Master:(1) 1557.500871] [lua/INFO] Master sending 'Task 13' To 'slave 1' -> [Jupiter:Slave:(2) 1567.135539] [lua/INFO] Slave 'slave 1' processing Task 13 -> [Tremblay:Master:(1) 1567.135539] [lua/INFO] Master done sending 'Task 13' To 'slave 1' -> [Tremblay:Master:(1) 1567.135539] [lua/INFO] Master sending 'Task 14' To 'slave 2' -> [Bourassa:Slave:(5) 1568.842948] [lua/INFO] Slave 'slave 0': task Task 12 done -> [Jupiter:Slave:(2) 1574.344305] [lua/INFO] Slave 'slave 1': task Task 13 done -> [Fafard:Slave:(3) 1740.201147] [lua/INFO] Slave 'slave 2' processing Task 14 -> [Tremblay:Master:(1) 1740.201147] [lua/INFO] Master done sending 'Task 14' To 'slave 2' -> [Tremblay:Master:(1) 1740.201147] [lua/INFO] Master sending 'Task 15' To 'slave 3' -> [Fafard:Slave:(3) 1747.409913] [lua/INFO] Slave 'slave 2': task Task 14 done -> [Ginette:Slave:(4) 1855.548352] [lua/INFO] Slave 'slave 3' processing Task 15 -> [Tremblay:Master:(1) 1855.548352] [lua/INFO] Master done sending 'Task 15' To 'slave 3' -> [Tremblay:Master:(1) 1855.548352] [lua/INFO] Master sending 'Task 16' To 'slave 0' -> [Ginette:Slave:(4) 1866.890429] [lua/INFO] Slave 'slave 3': task Task 15 done -> [Bourassa:Slave:(5) 2076.667828] [lua/INFO] Slave 'slave 0' processing Task 16 -> [Tremblay:Master:(1) 2076.667828] [lua/INFO] Master done sending 'Task 16' To 'slave 0' -> [Tremblay:Master:(1) 2076.667828] [lua/INFO] Master sending 'Task 17' To 'slave 1' -> [Jupiter:Slave:(2) 2086.302496] [lua/INFO] Slave 'slave 1' processing Task 17 -> [Tremblay:Master:(1) 2086.302496] [lua/INFO] Master done sending 'Task 17' To 'slave 1' -> [Tremblay:Master:(1) 2086.302496] [lua/INFO] Master sending 'Task 18' To 'slave 2' -> [Bourassa:Slave:(5) 2088.009905] [lua/INFO] Slave 'slave 0': task Task 16 done -> [Jupiter:Slave:(2) 2093.511262] [lua/INFO] Slave 'slave 1': task Task 17 done -> [Fafard:Slave:(3) 2259.368104] [lua/INFO] Slave 'slave 2' processing Task 18 -> [Tremblay:Master:(1) 2259.368104] [lua/INFO] Master done sending 'Task 18' To 'slave 2' -> [Tremblay:Master:(1) 2259.368104] [lua/INFO] Master sending 'Task 19' To 'slave 3' -> [Fafard:Slave:(3) 2266.576870] [lua/INFO] Slave 'slave 2': task Task 18 done -> [Ginette:Slave:(4) 2374.715308] [lua/INFO] Slave 'slave 3' processing Task 19 -> [Tremblay:Master:(1) 2374.715308] [lua/INFO] Master done sending 'Task 19' To 'slave 3' -> [Tremblay:Master:(1) 2374.715308] [lua/INFO] Master sending 'Task 20' To 'slave 0' -> [Ginette:Slave:(4) 2386.057386] [lua/INFO] Slave 'slave 3': task Task 19 done -> [Bourassa:Slave:(5) 2595.834785] [lua/INFO] Slave 'slave 0' processing Task 20 -> [Tremblay:Master:(1) 2595.834785] [lua/INFO] Master done sending 'Task 20' To 'slave 0' -> [Tremblay:Master:(1) 2595.834785] [lua/INFO] Master: All tasks have been dispatched. Let's tell everybody the computation is over. -> [Tremblay:Master:(1) 2595.834785] [lua/INFO] Master: sending finalize to slave 0 -> [Bourassa:Slave:(5) 2607.176862] [lua/INFO] Slave 'slave 0': task Task 20 done -> [Bourassa:Slave:(5) 2828.296338] [lua/INFO] Slave 'slave 0' got finalize msg -> [Bourassa:Slave:(5) 2828.296338] [lua/INFO] Slave 'slave 0': I'm Done . See You !! -> [Tremblay:Master:(1) 2828.296338] [lua/INFO] Master: sending finalize to slave 1 -> [Jupiter:Slave:(2) 2837.931006] [lua/INFO] Slave 'slave 1' got finalize msg -> [Jupiter:Slave:(2) 2837.931006] [lua/INFO] Slave 'slave 1': I'm Done . See You !! -> [Tremblay:Master:(1) 2837.931006] [lua/INFO] Master: sending finalize to slave 2 -> [Fafard:Slave:(3) 3010.996615] [lua/INFO] Slave 'slave 2' got finalize msg -> [Fafard:Slave:(3) 3010.996615] [lua/INFO] Slave 'slave 2': I'm Done . See You !! -> [Tremblay:Master:(1) 3010.996615] [lua/INFO] Master: sending finalize to slave 3 -> [Ginette:Slave:(4) 3126.343819] [lua/INFO] Slave 'slave 3' got finalize msg -> [Ginette:Slave:(4) 3126.343819] [lua/INFO] Slave 'slave 3': I'm Done . See You !! -> [Tremblay:Master:(1) 3126.343819] [lua/INFO] Master: Everything's done. -> [3126.343819] [lua/INFO] Simulation's over.See you. +> [Jupiter:Slave:(2) 5.405202] [lua/INFO] Slave 'slave 1' processing Task 1 +> [Tremblay:Master:(1) 5.405202] [lua/INFO] Master done sending 'Task 1' To 'slave 1' +> [Tremblay:Master:(1) 5.405202] [lua/INFO] Master sending 'Task 2' To 'slave 2' +> [Jupiter:Slave:(2) 12.613968] [lua/INFO] Slave 'slave 1': task Task 1 done +> [Fafard:Slave:(3) 30.082767] [lua/INFO] Slave 'slave 2' processing Task 2 +> [Tremblay:Master:(1) 30.082767] [lua/INFO] Master done sending 'Task 2' To 'slave 2' +> [Tremblay:Master:(1) 30.082767] [lua/INFO] Master sending 'Task 3' To 'slave 3' +> [Fafard:Slave:(3) 37.291533] [lua/INFO] Slave 'slave 2': task Task 2 done +> [Ginette:Slave:(4) 47.919864] [lua/INFO] Slave 'slave 3' processing Task 3 +> [Tremblay:Master:(1) 47.919864] [lua/INFO] Master done sending 'Task 3' To 'slave 3' +> [Tremblay:Master:(1) 47.919864] [lua/INFO] Master sending 'Task 4' To 'slave 0' +> [Ginette:Slave:(4) 59.261941] [lua/INFO] Slave 'slave 3': task Task 3 done +> [Bourassa:Slave:(5) 78.260299] [lua/INFO] Slave 'slave 0' processing Task 4 +> [Tremblay:Master:(1) 78.260299] [lua/INFO] Master done sending 'Task 4' To 'slave 0' +> [Tremblay:Master:(1) 78.260299] [lua/INFO] Master sending 'Task 5' To 'slave 1' +> [Jupiter:Slave:(2) 83.665501] [lua/INFO] Slave 'slave 1' processing Task 5 +> [Tremblay:Master:(1) 83.665501] [lua/INFO] Master done sending 'Task 5' To 'slave 1' +> [Tremblay:Master:(1) 83.665501] [lua/INFO] Master sending 'Task 6' To 'slave 2' +> [Bourassa:Slave:(5) 89.602376] [lua/INFO] Slave 'slave 0': task Task 4 done +> [Jupiter:Slave:(2) 90.874267] [lua/INFO] Slave 'slave 1': task Task 5 done +> [Fafard:Slave:(3) 108.343066] [lua/INFO] Slave 'slave 2' processing Task 6 +> [Tremblay:Master:(1) 108.343066] [lua/INFO] Master done sending 'Task 6' To 'slave 2' +> [Tremblay:Master:(1) 108.343066] [lua/INFO] Master sending 'Task 7' To 'slave 3' +> [Fafard:Slave:(3) 115.551832] [lua/INFO] Slave 'slave 2': task Task 6 done +> [Ginette:Slave:(4) 126.180163] [lua/INFO] Slave 'slave 3' processing Task 7 +> [Tremblay:Master:(1) 126.180163] [lua/INFO] Master done sending 'Task 7' To 'slave 3' +> [Tremblay:Master:(1) 126.180163] [lua/INFO] Master sending 'Task 8' To 'slave 0' +> [Ginette:Slave:(4) 137.522240] [lua/INFO] Slave 'slave 3': task Task 7 done +> [Bourassa:Slave:(5) 156.520598] [lua/INFO] Slave 'slave 0' processing Task 8 +> [Tremblay:Master:(1) 156.520598] [lua/INFO] Master done sending 'Task 8' To 'slave 0' +> [Tremblay:Master:(1) 156.520598] [lua/INFO] Master sending 'Task 9' To 'slave 1' +> [Jupiter:Slave:(2) 161.925800] [lua/INFO] Slave 'slave 1' processing Task 9 +> [Tremblay:Master:(1) 161.925800] [lua/INFO] Master done sending 'Task 9' To 'slave 1' +> [Tremblay:Master:(1) 161.925800] [lua/INFO] Master sending 'Task 10' To 'slave 2' +> [Bourassa:Slave:(5) 167.862675] [lua/INFO] Slave 'slave 0': task Task 8 done +> [Jupiter:Slave:(2) 169.134566] [lua/INFO] Slave 'slave 1': task Task 9 done +> [Fafard:Slave:(3) 186.603365] [lua/INFO] Slave 'slave 2' processing Task 10 +> [Tremblay:Master:(1) 186.603365] [lua/INFO] Master done sending 'Task 10' To 'slave 2' +> [Tremblay:Master:(1) 186.603365] [lua/INFO] Master sending 'Task 11' To 'slave 3' +> [Fafard:Slave:(3) 193.812131] [lua/INFO] Slave 'slave 2': task Task 10 done +> [Ginette:Slave:(4) 204.440462] [lua/INFO] Slave 'slave 3' processing Task 11 +> [Tremblay:Master:(1) 204.440462] [lua/INFO] Master done sending 'Task 11' To 'slave 3' +> [Tremblay:Master:(1) 204.440462] [lua/INFO] Master sending 'Task 12' To 'slave 0' +> [Ginette:Slave:(4) 215.782540] [lua/INFO] Slave 'slave 3': task Task 11 done +> [Bourassa:Slave:(5) 234.780897] [lua/INFO] Slave 'slave 0' processing Task 12 +> [Tremblay:Master:(1) 234.780897] [lua/INFO] Master done sending 'Task 12' To 'slave 0' +> [Tremblay:Master:(1) 234.780897] [lua/INFO] Master sending 'Task 13' To 'slave 1' +> [Jupiter:Slave:(2) 240.186099] [lua/INFO] Slave 'slave 1' processing Task 13 +> [Tremblay:Master:(1) 240.186099] [lua/INFO] Master done sending 'Task 13' To 'slave 1' +> [Tremblay:Master:(1) 240.186099] [lua/INFO] Master sending 'Task 14' To 'slave 2' +> [Bourassa:Slave:(5) 246.122974] [lua/INFO] Slave 'slave 0': task Task 12 done +> [Jupiter:Slave:(2) 247.394865] [lua/INFO] Slave 'slave 1': task Task 13 done +> [Fafard:Slave:(3) 264.863664] [lua/INFO] Slave 'slave 2' processing Task 14 +> [Tremblay:Master:(1) 264.863664] [lua/INFO] Master done sending 'Task 14' To 'slave 2' +> [Tremblay:Master:(1) 264.863664] [lua/INFO] Master sending 'Task 15' To 'slave 3' +> [Fafard:Slave:(3) 272.072430] [lua/INFO] Slave 'slave 2': task Task 14 done +> [Ginette:Slave:(4) 282.700762] [lua/INFO] Slave 'slave 3' processing Task 15 +> [Tremblay:Master:(1) 282.700762] [lua/INFO] Master done sending 'Task 15' To 'slave 3' +> [Tremblay:Master:(1) 282.700762] [lua/INFO] Master sending 'Task 16' To 'slave 0' +> [Ginette:Slave:(4) 294.042839] [lua/INFO] Slave 'slave 3': task Task 15 done +> [Bourassa:Slave:(5) 313.041196] [lua/INFO] Slave 'slave 0' processing Task 16 +> [Tremblay:Master:(1) 313.041196] [lua/INFO] Master done sending 'Task 16' To 'slave 0' +> [Tremblay:Master:(1) 313.041196] [lua/INFO] Master sending 'Task 17' To 'slave 1' +> [Jupiter:Slave:(2) 318.446398] [lua/INFO] Slave 'slave 1' processing Task 17 +> [Tremblay:Master:(1) 318.446398] [lua/INFO] Master done sending 'Task 17' To 'slave 1' +> [Tremblay:Master:(1) 318.446398] [lua/INFO] Master sending 'Task 18' To 'slave 2' +> [Bourassa:Slave:(5) 324.383273] [lua/INFO] Slave 'slave 0': task Task 16 done +> [Jupiter:Slave:(2) 325.655164] [lua/INFO] Slave 'slave 1': task Task 17 done +> [Fafard:Slave:(3) 343.123963] [lua/INFO] Slave 'slave 2' processing Task 18 +> [Tremblay:Master:(1) 343.123963] [lua/INFO] Master done sending 'Task 18' To 'slave 2' +> [Tremblay:Master:(1) 343.123963] [lua/INFO] Master sending 'Task 19' To 'slave 3' +> [Fafard:Slave:(3) 350.332729] [lua/INFO] Slave 'slave 2': task Task 18 done +> [Ginette:Slave:(4) 360.961061] [lua/INFO] Slave 'slave 3' processing Task 19 +> [Tremblay:Master:(1) 360.961061] [lua/INFO] Master done sending 'Task 19' To 'slave 3' +> [Tremblay:Master:(1) 360.961061] [lua/INFO] Master sending 'Task 20' To 'slave 0' +> [Ginette:Slave:(4) 372.303138] [lua/INFO] Slave 'slave 3': task Task 19 done +> [Bourassa:Slave:(5) 391.301495] [lua/INFO] Slave 'slave 0' processing Task 20 +> [Tremblay:Master:(1) 391.301495] [lua/INFO] Master done sending 'Task 20' To 'slave 0' +> [Tremblay:Master:(1) 391.301495] [lua/INFO] Master: All tasks have been dispatched. Let's tell everybody the computation is over. +> [Tremblay:Master:(1) 391.301495] [lua/INFO] Master: sending finalize to slave 0 +> [Bourassa:Slave:(5) 402.643572] [lua/INFO] Slave 'slave 0': task Task 20 done +> [Tremblay:Master:(1) 432.984007] [lua/INFO] Master: sending finalize to slave 1 +> [Bourassa:Slave:(5) 432.984007] [lua/INFO] Slave 'slave 0' got finalize msg +> [Bourassa:Slave:(5) 432.984007] [lua/INFO] Slave 'slave 0': I'm Done . See You !! +> [Jupiter:Slave:(2) 438.389209] [lua/INFO] Slave 'slave 1' got finalize msg +> [Jupiter:Slave:(2) 438.389209] [lua/INFO] Slave 'slave 1': I'm Done . See You !! +> [Tremblay:Master:(1) 438.389209] [lua/INFO] Master: sending finalize to slave 2 +> [Fafard:Slave:(3) 463.066774] [lua/INFO] Slave 'slave 2' got finalize msg +> [Fafard:Slave:(3) 463.066774] [lua/INFO] Slave 'slave 2': I'm Done . See You !! +> [Tremblay:Master:(1) 463.066774] [lua/INFO] Master: sending finalize to slave 3 +> [Ginette:Slave:(4) 480.903871] [lua/INFO] Slave 'slave 3' got finalize msg +> [Ginette:Slave:(4) 480.903871] [lua/INFO] Slave 'slave 3': I'm Done . See You !! +> [Tremblay:Master:(1) 480.903871] [lua/INFO] Master: Everything's done. +> [480.903871] [lua/INFO] Simulation's over.See you. diff --git a/examples/lua/masterslave/master_slave.lua b/examples/lua/masterslave/master_slave.lua index 0e74608f06..2aeb917769 100644 --- a/examples/lua/masterslave/master_slave.lua +++ b/examples/lua/masterslave/master_slave.lua @@ -1,5 +1,5 @@ -dofile '../console/master.lua' -dofile '../console/slave.lua' +dofile 'master.lua' +dofile 'slave.lua' -- Simulation Code ---------------------------------------------------------- require "simgrid" diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt index 5d9bb31f9b..9efb438e51 100644 --- a/examples/msg/masterslave/CMakeLists.txt +++ b/examples/msg/masterslave/CMakeLists.txt @@ -6,7 +6,6 @@ add_executable(masterslave_failure "masterslave_failure.c") add_executable(masterslave_forwarder "masterslave_forwarder.c") add_executable(masterslave_mailbox "masterslave_mailbox.c") add_executable(masterslave_bypass "masterslave_bypass.c") -add_executable(masterslave_console "masterslave_console.c") add_executable(masterslave_cluster "masterslave_cluster.c") add_executable(masterslave_kill "masterslave_kill.c") add_executable(masterslave_arg "masterslave_arg.c") @@ -19,7 +18,6 @@ if(WIN32) target_link_libraries(masterslave_failure simgrid ) target_link_libraries(masterslave_mailbox simgrid ) target_link_libraries(masterslave_bypass simgrid ) - target_link_libraries(masterslave_console simgrid ) target_link_libraries(masterslave_kill simgrid ) target_link_libraries(masterslave_arg simgrid ) target_link_libraries(masterslave_platfgen simgrid ) @@ -29,7 +27,6 @@ else() target_link_libraries(masterslave_failure simgrid m ) target_link_libraries(masterslave_mailbox simgrid m ) target_link_libraries(masterslave_bypass simgrid m ) - target_link_libraries(masterslave_console simgrid m ) target_link_libraries(masterslave_kill simgrid m ) target_link_libraries(masterslave_arg simgrid m ) target_link_libraries(masterslave_platfgen simgrid m ) @@ -47,7 +44,6 @@ set(tesh_files ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_crosstraffic.tesh ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder.tesh ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_multicore.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_console.tesh ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure_crosstraffic.tesh ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_kill.tesh ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh @@ -74,7 +70,6 @@ set(examples_src ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_arg.c ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_bypass.c ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cluster.c - ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_console.c ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure.c ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder.c ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_kill.c @@ -85,7 +80,6 @@ set(examples_src ) set(bin_files ${bin_files} - ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua PARENT_SCOPE ) set(txt_files diff --git a/examples/msg/masterslave/masterslave_console.c b/examples/msg/masterslave/masterslave_console.c deleted file mode 100644 index d49df00eea..0000000000 --- a/examples/msg/masterslave/masterslave_console.c +++ /dev/null @@ -1,139 +0,0 @@ -/* Copyright (c) 2007-2012. The SimGrid Team. All rights reserved. */ - -/* 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. */ - -/** @addtogroup MSG_examples - * - * - masterslave/masterslave_console.c: demonstrate how to use - * lua files instead of XML for the platform and deployment - * declaration using @ref MSG_load_platform_script. The most - * interesting part is probably not the C code, but rather the - * masterslave/masterslave_script.lua, which demonstrates - * how to express the platform and deployment in lua. - * - */ - -#include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ -#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ - -/* Create a log channel to have nice outputs. */ -#include "xbt/log.h" -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, - "Messages specific for this msg example"); -#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ - -int master(int argc, char *argv[]); -int slave(int argc, char *argv[]); -msg_error_t test_all(const char *); - -/** Emitter function */ -int master(int argc, char *argv[]) -{ - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long slaves_count = atol(argv[4]); - int i; - - XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, - number_of_tasks); - for (i = 0; i < number_of_tasks; i++) { - char mailbox[256]; - char sprintf_buffer[256]; - msg_task_t task = NULL; - - sprintf(mailbox, "slave-%ld", i % slaves_count); - sprintf(sprintf_buffer, "Task_%d", i); - task = - MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, - NULL); - if (number_of_tasks < 10000 || i % 10000 == 0) - XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, - number_of_tasks, mailbox); - MSG_task_send(task, mailbox); - } - - XBT_INFO - ("All tasks have been dispatched. Let's tell everybody the computation is over."); - for (i = 0; i < slaves_count; i++) { - char mailbox[80]; - - sprintf(mailbox, "slave-%ld", i % slaves_count); - msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0); - MSG_task_send(finalize, mailbox); - } - - XBT_INFO("Goodbye now!"); - return 0; -} /* end_of_master */ - -/** Receiver function */ -int slave(int argc, char *argv[]) -{ - msg_task_t task = NULL; - _XBT_GNUC_UNUSED int res; - int id = -1; - char mailbox[80]; - _XBT_GNUC_UNUSED int read; - - read = sscanf(argv[1], "%d", &id); - xbt_assert(read, "Invalid argument %s\n", argv[1]); - - sprintf(mailbox, "slave-%d", id); - - while (1) { - res = MSG_task_receive(&(task), mailbox); - xbt_assert(res == MSG_OK, "MSG_task_get failed"); - - XBT_INFO("Received \"%s\"", MSG_task_get_name(task)); - if (!strcmp(MSG_task_get_name(task), "finalize")) { - MSG_task_destroy(task); - break; - } - - XBT_INFO("Processing \"%s\"", MSG_task_get_name(task)); - MSG_task_execute(task); - XBT_INFO("\"%s\" done", MSG_task_get_name(task)); - MSG_task_destroy(task); - task = NULL; - } - XBT_INFO("I'm done. See you!"); - return 0; -} /* end_of_slave */ - -/** Test function */ -msg_error_t test_all(const char *file) //(void) -{ - msg_error_t res = MSG_OK; - - /*start by registering functions before loading script */ - MSG_function_register("master", master); - MSG_function_register("slave", slave); - MSG_load_platform_script(file); - - res = MSG_main(); - - XBT_INFO("Simulation time %g", MSG_get_clock()); - return res; -} /* end_of_test_all */ - -/** Main function */ -int main(int argc, char *argv[]) -{ - msg_error_t res = MSG_OK; - - MSG_init(&argc, argv); - if (argc < 2) { - printf("Usage: %s platform_script[.lua]\n", argv[0]); - printf("example: %s platform_script.lua\n", argv[0]); - exit(1); - } - res = test_all(argv[1]); - - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ diff --git a/examples/msg/masterslave/masterslave_console.tesh b/examples/msg/masterslave/masterslave_console.tesh deleted file mode 100644 index 24709944f0..0000000000 --- a/examples/msg/masterslave/masterslave_console.tesh +++ /dev/null @@ -1,96 +0,0 @@ -#! ./tesh - -! output sort -$ $SG_TEST_EXENV ${bindir:=.}/masterslave_console ${srcdir:=.}/platform_script.lua --log=surf_parse.thres:critical "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:master@Tremblay) Got 4 slaves and 20 tasks to process -> [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "slave-0" -> [ 221.119476] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "slave-1" -> [ 221.119476] (5:slave@Bourassa) Received "Task_0" -> [ 221.119476] (5:slave@Bourassa) Processing "Task_0" -> [ 230.754144] (1:master@Tremblay) Sending "Task_2" (of 20) to mailbox "slave-2" -> [ 230.754144] (2:slave@Jupiter) Received "Task_1" -> [ 230.754144] (2:slave@Jupiter) Processing "Task_1" -> [ 232.461553] (5:slave@Bourassa) "Task_0" done -> [ 237.962910] (2:slave@Jupiter) "Task_1" done -> [ 403.819753] (1:master@Tremblay) Sending "Task_3" (of 20) to mailbox "slave-3" -> [ 403.819753] (3:slave@Fafard) Received "Task_2" -> [ 403.819753] (3:slave@Fafard) Processing "Task_2" -> [ 411.028519] (3:slave@Fafard) "Task_2" done -> [ 519.166957] (1:master@Tremblay) Sending "Task_4" (of 20) to mailbox "slave-0" -> [ 519.166957] (4:slave@Ginette) Received "Task_3" -> [ 519.166957] (4:slave@Ginette) Processing "Task_3" -> [ 530.509034] (4:slave@Ginette) "Task_3" done -> [ 740.286433] (1:master@Tremblay) Sending "Task_5" (of 20) to mailbox "slave-1" -> [ 740.286433] (5:slave@Bourassa) Received "Task_4" -> [ 740.286433] (5:slave@Bourassa) Processing "Task_4" -> [ 749.921101] (1:master@Tremblay) Sending "Task_6" (of 20) to mailbox "slave-2" -> [ 749.921101] (2:slave@Jupiter) Received "Task_5" -> [ 749.921101] (2:slave@Jupiter) Processing "Task_5" -> [ 751.628510] (5:slave@Bourassa) "Task_4" done -> [ 757.129867] (2:slave@Jupiter) "Task_5" done -> [ 922.986710] (1:master@Tremblay) Sending "Task_7" (of 20) to mailbox "slave-3" -> [ 922.986710] (3:slave@Fafard) Received "Task_6" -> [ 922.986710] (3:slave@Fafard) Processing "Task_6" -> [ 930.195476] (3:slave@Fafard) "Task_6" done -> [1038.333914] (1:master@Tremblay) Sending "Task_8" (of 20) to mailbox "slave-0" -> [1038.333914] (4:slave@Ginette) Received "Task_7" -> [1038.333914] (4:slave@Ginette) Processing "Task_7" -> [1049.675991] (4:slave@Ginette) "Task_7" done -> [1259.453390] (1:master@Tremblay) Sending "Task_9" (of 20) to mailbox "slave-1" -> [1259.453390] (5:slave@Bourassa) Received "Task_8" -> [1259.453390] (5:slave@Bourassa) Processing "Task_8" -> [1269.088058] (1:master@Tremblay) Sending "Task_10" (of 20) to mailbox "slave-2" -> [1269.088058] (2:slave@Jupiter) Received "Task_9" -> [1269.088058] (2:slave@Jupiter) Processing "Task_9" -> [1270.795467] (5:slave@Bourassa) "Task_8" done -> [1276.296824] (2:slave@Jupiter) "Task_9" done -> [1442.153667] (1:master@Tremblay) Sending "Task_11" (of 20) to mailbox "slave-3" -> [1442.153667] (3:slave@Fafard) Received "Task_10" -> [1442.153667] (3:slave@Fafard) Processing "Task_10" -> [1449.362433] (3:slave@Fafard) "Task_10" done -> [1557.500871] (1:master@Tremblay) Sending "Task_12" (of 20) to mailbox "slave-0" -> [1557.500871] (4:slave@Ginette) Received "Task_11" -> [1557.500871] (4:slave@Ginette) Processing "Task_11" -> [1568.842948] (4:slave@Ginette) "Task_11" done -> [1778.620347] (1:master@Tremblay) Sending "Task_13" (of 20) to mailbox "slave-1" -> [1778.620347] (5:slave@Bourassa) Received "Task_12" -> [1778.620347] (5:slave@Bourassa) Processing "Task_12" -> [1788.255015] (1:master@Tremblay) Sending "Task_14" (of 20) to mailbox "slave-2" -> [1788.255015] (2:slave@Jupiter) Received "Task_13" -> [1788.255015] (2:slave@Jupiter) Processing "Task_13" -> [1789.962424] (5:slave@Bourassa) "Task_12" done -> [1795.463781] (2:slave@Jupiter) "Task_13" done -> [1961.320624] (1:master@Tremblay) Sending "Task_15" (of 20) to mailbox "slave-3" -> [1961.320624] (3:slave@Fafard) Received "Task_14" -> [1961.320624] (3:slave@Fafard) Processing "Task_14" -> [1968.529390] (3:slave@Fafard) "Task_14" done -> [2076.667828] (1:master@Tremblay) Sending "Task_16" (of 20) to mailbox "slave-0" -> [2076.667828] (4:slave@Ginette) Received "Task_15" -> [2076.667828] (4:slave@Ginette) Processing "Task_15" -> [2088.009905] (4:slave@Ginette) "Task_15" done -> [2297.787304] (1:master@Tremblay) Sending "Task_17" (of 20) to mailbox "slave-1" -> [2297.787304] (5:slave@Bourassa) Received "Task_16" -> [2297.787304] (5:slave@Bourassa) Processing "Task_16" -> [2307.421972] (1:master@Tremblay) Sending "Task_18" (of 20) to mailbox "slave-2" -> [2307.421972] (2:slave@Jupiter) Received "Task_17" -> [2307.421972] (2:slave@Jupiter) Processing "Task_17" -> [2309.129381] (5:slave@Bourassa) "Task_16" done -> [2314.630738] (2:slave@Jupiter) "Task_17" done -> [2480.487581] (1:master@Tremblay) Sending "Task_19" (of 20) to mailbox "slave-3" -> [2480.487581] (3:slave@Fafard) Received "Task_18" -> [2480.487581] (3:slave@Fafard) Processing "Task_18" -> [2487.696347] (3:slave@Fafard) "Task_18" done -> [2595.834785] (1:master@Tremblay) All tasks have been dispatched. Let's tell everybody the computation is over. -> [2595.834785] (4:slave@Ginette) Received "Task_19" -> [2595.834785] (4:slave@Ginette) Processing "Task_19" -> [2607.176862] (4:slave@Ginette) "Task_19" done -> [2616.664880] (5:slave@Bourassa) Received "finalize" -> [2616.664880] (5:slave@Bourassa) I'm done. See you! -> [2617.572494] (2:slave@Jupiter) Received "finalize" -> [2617.572494] (2:slave@Jupiter) I'm done. See you! -> [2633.875776] (3:slave@Fafard) Received "finalize" -> [2633.875776] (3:slave@Fafard) I'm done. See you! -> [2644.741817] (0:@) Simulation time 2644.74 -> [2644.741817] (1:master@Tremblay) Goodbye now! -> [2644.741817] (4:slave@Ginette) Received "finalize" -> [2644.741817] (4:slave@Ginette) I'm done. See you! diff --git a/examples/msg/masterslave/platform_script.lua b/examples/msg/masterslave/platform_script.lua deleted file mode 100644 index 75dac4fbd1..0000000000 --- a/examples/msg/masterslave/platform_script.lua +++ /dev/null @@ -1,67 +0,0 @@ --- Copyright (c) 2010-2012. The SimGrid Team. All rights reserved. - --- 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. - - --- This file describes a platform very similar to the small_platform.xml, but in lua --- It is naturally to be used with the MSG_load_platform_script function - --- Of course, such a flat file is maybe not very interesting wrt xml. --- The full power of lua reveals when you describe your platform programatically. - -require "simgrid" - -simgrid.platf.open(); - -simgrid.platf.AS_open{id="AS0",mode="Full"}; - -simgrid.platf.host_new{id="Tremblay",power=98095000}; -simgrid.platf.host_new{id="Jupiter",power=76296000}; -simgrid.platf.host_new{id="Fafard",power=76296000}; -simgrid.platf.host_new{id="Ginette",power=48492000}; -simgrid.platf.host_new{id="Bourassa",power=48492000}; - --- create Links -for i=10,0,-1 do - simgrid.platf.link_new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; -end - -simgrid.platf.route_new{src="Tremblay",dest="Jupiter",links="1",symmetrical=0}; -simgrid.platf.route_new{src="Tremblay",dest="Fafard",links="0,1,2,3,4,8",symmetrical=0}; -simgrid.platf.route_new{src="Tremblay",dest="Ginette",links="3,4,5",symmetrical=0}; -simgrid.platf.route_new{src="Tremblay",dest="Bourassa",links="0,1,3,2,4,6,7",symmetrical=0}; - -simgrid.platf.route_new{src="Jupiter",dest="Tremblay",links="1",symmetrical=0}; -simgrid.platf.route_new{src="Jupiter",dest="Fafard",links="0,1,2,3,4,8,9",symmetrical=0}; -simgrid.platf.route_new{src="Jupiter",dest="Ginette",links="3,4,5,9",symmetrical=0}; -simgrid.platf.route_new{src="Jupiter",dest="Bourassa",links="0,1,2,3,4,6,7,9",symmetrical=0}; - -simgrid.platf.route_new{src="Fafard",dest="Tremblay",links="0,1,2,3,4,8",symmetrical=0}; -simgrid.platf.route_new{src="Fafard",dest="Jupiter",links="0,1,2,3,4,8,9",symmetrical=0}; -simgrid.platf.route_new{src="Fafard",dest="Ginette",links="0,1,2,5,8",symmetrical=0}; -simgrid.platf.route_new{src="Fafard",dest="Bourassa",links="6,7,8",symmetrical=0}; - -simgrid.platf.route_new{src="Ginette",dest="Tremblay",links="3,4,5",symmetrical=0}; -simgrid.platf.route_new{src="Ginette",dest="Jupiter",links="3,4,5,9",symmetrical=0}; -simgrid.platf.route_new{src="Ginette",dest="Fafard",links="0,1,2,5,8",symmetrical=0}; -simgrid.platf.route_new{src="Ginette",dest="Bourassa",links="0,1,2,5,6,7",symmetrical=0}; - -simgrid.platf.route_new{src="Bourassa",dest="Tremblay",links="0,1,3,2,4,6,7",symmetrical=0}; -simgrid.platf.route_new{src="Bourassa",dest="Jupiter",links="0,1,2,3,4,6,7,9",symmetrical=0}; -simgrid.platf.route_new{src="Bourassa",dest="Fafard",links="6,7,8",symmetrical=0}; -simgrid.platf.route_new{src="Bourassa",dest="Ginette",links="0,1,2,5,6,7",symmetrical=0}; -simgrid.platf.AS_close(); - -simgrid.platf.close(); -simgrid.msg_register_platform(); - ---Set Application -simgrid.host.set_function{host="Tremblay",fct="master",args="20,550000000,1000000,4"}; -simgrid.host.set_function{host="Bourassa",fct="slave",args="0"}; -simgrid.host.set_function{host="Jupiter",fct="slave",args="1"}; -simgrid.host.set_function{host="Fafard",fct="slave",args="2"}; -simgrid.host.set_function{host="Ginette",fct="slave",args="3"}; - ---Save Application -simgrid.msg_register_application();