From b082c54b2467c9ec060d956dee6c4f688d50e4c4 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 26 Apr 2016 09:36:24 +0200 Subject: [PATCH 1/1] fix the lua test --- src/bindings/lua/lua_platf.cpp | 2 +- teshsuite/lua/lua_platforms.tesh | 60 ++++++++++++++++---------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 9d52127c65..bc870a619f 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -541,7 +541,7 @@ void sglua_register_platf_functions(lua_State* L) { lua_getglobal(L, "simgrid"); /* simgrid */ luaL_newlib(L, platf_functions); /* simgrid simgrid.platf */ - lua_setfield(L, -2, "platf"); /* simgrid */ + lua_setfield(L, -2, "engine"); /* simgrid */ lua_pop(L, 1); /* -- */ } diff --git a/teshsuite/lua/lua_platforms.tesh b/teshsuite/lua/lua_platforms.tesh index 172aa2c30a..03dd4cd1fa 100644 --- a/teshsuite/lua/lua_platforms.tesh +++ b/teshsuite/lua/lua_platforms.tesh @@ -1,34 +1,34 @@ -$ ${bindir:=.}/../../examples/msg/app-masterworker/app-masterworker ${srcdir:=.}/../../examples/platforms/small_platform.lua ${srcdir:=.}/../../examples/msg/masterslave/deployment_masterslave_mailbox.xml -> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 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.002265] [msg_test/INFO] Sending "Task_1" (of 20) to mailbox "slave-1" -> [Tremblay:master:(1) 0.171420] [msg_test/INFO] Sending "Task_2" (of 20) to mailbox "slave-2" -> [Tremblay:master:(1) 0.329817] [msg_test/INFO] Sending "Task_3" (of 20) to mailbox "slave-3" -> [Tremblay:master:(1) 0.453549] [msg_test/INFO] Sending "Task_4" (of 20) to mailbox "slave-4" -> [Tremblay:master:(1) 0.586168] [msg_test/INFO] Sending "Task_5" (of 20) to mailbox "slave-0" -> [Tremblay:master:(1) 0.588433] [msg_test/INFO] Sending "Task_6" (of 20) to mailbox "slave-1" -> [Tremblay:master:(1) 0.995917] [msg_test/INFO] Sending "Task_7" (of 20) to mailbox "slave-2" -> [Tremblay:master:(1) 1.154314] [msg_test/INFO] Sending "Task_8" (of 20) to mailbox "slave-3" -> [Tremblay:master:(1) 1.608379] [msg_test/INFO] Sending "Task_9" (of 20) to mailbox "slave-4" -> [Tremblay:master:(1) 1.749885] [msg_test/INFO] Sending "Task_10" (of 20) to mailbox "slave-0" -> [Tremblay:master:(1) 1.752150] [msg_test/INFO] Sending "Task_11" (of 20) to mailbox "slave-1" -> [Tremblay:master:(1) 1.921304] [msg_test/INFO] Sending "Task_12" (of 20) to mailbox "slave-2" -> [Tremblay:master:(1) 2.079701] [msg_test/INFO] Sending "Task_13" (of 20) to mailbox "slave-3" -> [Tremblay:master:(1) 2.763209] [msg_test/INFO] Sending "Task_14" (of 20) to mailbox "slave-4" -> [Tremblay:master:(1) 2.913601] [msg_test/INFO] Sending "Task_15" (of 20) to mailbox "slave-0" -> [Tremblay:master:(1) 2.915867] [msg_test/INFO] Sending "Task_16" (of 20) to mailbox "slave-1" -> [Tremblay:master:(1) 3.085021] [msg_test/INFO] Sending "Task_17" (of 20) to mailbox "slave-2" -> [Tremblay:master:(1) 3.243418] [msg_test/INFO] Sending "Task_18" (of 20) to mailbox "slave-3" -> [Tremblay:master:(1) 3.918038] [msg_test/INFO] Sending "Task_19" (of 20) to mailbox "slave-4" -> [Tremblay:master:(1) 4.077318] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over. -> [Tremblay:slave:(2) 4.077513] [msg_test/INFO] I'm done. See you! -> [Jupiter:slave:(3) 4.096528] [msg_test/INFO] I'm done. See you! -> [Fafard:slave:(4) 4.122236] [msg_test/INFO] I'm done. See you! -> [Ginette:slave:(5) 4.965689] [msg_test/INFO] I'm done. See you! -> [Bourassa:slave:(6) 5.133855] [msg_test/INFO] I'm done. See you! -> [5.133855] [msg_test/INFO] Simulation time 5.13386 +$ ${bindir:=.}/../../examples/msg/app-masterworker/app-masterworker ${srcdir:=.}/../../examples/platforms/small_platform.lua ${srcdir:=.}/../../examples/msg/app-masterworker/app-masterworker_d.xml +> [Tremblay:master:(1) 0.000000] [msg_app_masterworker/INFO] Got 5 workers and 20 tasks to process +> [Tremblay:master:(1) 0.000000] [msg_app_masterworker/INFO] Sending "Task_0" (of 20) to mailbox "worker-0" +> [Tremblay:master:(1) 0.002265] [msg_app_masterworker/INFO] Sending "Task_1" (of 20) to mailbox "worker-1" +> [Tremblay:master:(1) 0.171420] [msg_app_masterworker/INFO] Sending "Task_2" (of 20) to mailbox "worker-2" +> [Tremblay:master:(1) 0.329817] [msg_app_masterworker/INFO] Sending "Task_3" (of 20) to mailbox "worker-3" +> [Tremblay:master:(1) 0.453549] [msg_app_masterworker/INFO] Sending "Task_4" (of 20) to mailbox "worker-4" +> [Tremblay:master:(1) 0.586168] [msg_app_masterworker/INFO] Sending "Task_5" (of 20) to mailbox "worker-0" +> [Tremblay:master:(1) 0.588433] [msg_app_masterworker/INFO] Sending "Task_6" (of 20) to mailbox "worker-1" +> [Tremblay:master:(1) 0.995917] [msg_app_masterworker/INFO] Sending "Task_7" (of 20) to mailbox "worker-2" +> [Tremblay:master:(1) 1.154314] [msg_app_masterworker/INFO] Sending "Task_8" (of 20) to mailbox "worker-3" +> [Tremblay:master:(1) 1.608379] [msg_app_masterworker/INFO] Sending "Task_9" (of 20) to mailbox "worker-4" +> [Tremblay:master:(1) 1.749885] [msg_app_masterworker/INFO] Sending "Task_10" (of 20) to mailbox "worker-0" +> [Tremblay:master:(1) 1.752150] [msg_app_masterworker/INFO] Sending "Task_11" (of 20) to mailbox "worker-1" +> [Tremblay:master:(1) 1.921304] [msg_app_masterworker/INFO] Sending "Task_12" (of 20) to mailbox "worker-2" +> [Tremblay:master:(1) 2.079701] [msg_app_masterworker/INFO] Sending "Task_13" (of 20) to mailbox "worker-3" +> [Tremblay:master:(1) 2.763209] [msg_app_masterworker/INFO] Sending "Task_14" (of 20) to mailbox "worker-4" +> [Tremblay:master:(1) 2.913601] [msg_app_masterworker/INFO] Sending "Task_15" (of 20) to mailbox "worker-0" +> [Tremblay:master:(1) 2.915867] [msg_app_masterworker/INFO] Sending "Task_16" (of 20) to mailbox "worker-1" +> [Tremblay:master:(1) 3.085021] [msg_app_masterworker/INFO] Sending "Task_17" (of 20) to mailbox "worker-2" +> [Tremblay:master:(1) 3.243418] [msg_app_masterworker/INFO] Sending "Task_18" (of 20) to mailbox "worker-3" +> [Tremblay:master:(1) 3.918038] [msg_app_masterworker/INFO] Sending "Task_19" (of 20) to mailbox "worker-4" +> [Tremblay:master:(1) 4.077318] [msg_app_masterworker/INFO] All tasks have been dispatched. Let's tell everybody the computation is over. +> [Tremblay:worker:(2) 4.077513] [msg_app_masterworker/INFO] I'm done. See you! +> [Jupiter:worker:(3) 4.096528] [msg_app_masterworker/INFO] I'm done. See you! +> [Fafard:worker:(4) 4.122236] [msg_app_masterworker/INFO] I'm done. See you! +> [Ginette:worker:(5) 4.965689] [msg_app_masterworker/INFO] I'm done. See you! +> [Bourassa:worker:(6) 5.133855] [msg_app_masterworker/INFO] I'm done. See you! +> [5.133855] [msg_app_masterworker/INFO] Simulation time 5.13386 -$ $SG_TEST_EXENV ${bindir:=.}/../../examples/msg/token_ring/token_ring ${srcdir:=.}/../../examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/../../examples/msg/app-token-ring/app-token-ring ${srcdir:=.}/../../examples/platforms/routing_cluster.lua "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Number of host '6' > [ 0.000000] (1:0@host1) Host "0" send 'Token' to Host "1" > [ 0.017354] (2:1@host2) Host "1" received "Token" -- 2.20.1