From 41d16778405580c3ba9e9097fa19ef1b9fbd113d Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Mon, 8 Jun 2015 23:07:48 +0200 Subject: [PATCH 1/1] [Bugfix] Fixed wrong property in SimSplay test: latency<->lat --- examples/lua/SimSplay/platform_script.lua | 2 +- src/bindings/lua/lua_comm.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/lua/SimSplay/platform_script.lua b/examples/lua/SimSplay/platform_script.lua index 1226288658..eaf04bec8e 100644 --- a/examples/lua/SimSplay/platform_script.lua +++ b/examples/lua/SimSplay/platform_script.lua @@ -20,7 +20,7 @@ require "simgrid" simgrid.host.setProperty{host="Fafard",prop_id="port",prop_value="76"}; -- create Links for i=10,0,-1 do - simgrid.AS.addLink{AS="AS0",id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; + simgrid.AS.addLink{AS="AS0",id=i,bandwidth=252750+ i*768,lat=0.000270544+i*0.087}; end -- simgrid.route.new(src_id,des_id,links_nb,links_list) simgrid.AS.addRoute("AS0","Tremblay","Jupiter",{"1"}); diff --git a/src/bindings/lua/lua_comm.c b/src/bindings/lua/lua_comm.c index 5e761e6113..06fb6019a3 100644 --- a/src/bindings/lua/lua_comm.c +++ b/src/bindings/lua/lua_comm.c @@ -181,8 +181,6 @@ void sglua_register_comm_functions(lua_State* L) /* create a table simgrid.comm and fill it with com functions */ lua_getglobal(L, "simgrid"); /* simgrid */ luaL_newlib(L, comm_functions); /* simgrid simgrid.comm */ - lua_setfield(L, -2, "comm"); /* simgrid */ - lua_getfield(L, -1, "host"); /* simgrid simgrid.comm */ /* create the metatable for comm, add it to the Lua registry */ luaL_newmetatable(L, COMM_MODULE_NAME); /* simgrid simgrid.comm mt */ @@ -194,7 +192,7 @@ void sglua_register_comm_functions(lua_State* L) * Copy the table and push it onto the stack. * Required for the lua_setfield call below. */ - lua_getfield(L, -3, "comm"); /* simgrid simgrid.comm mt simgrid.comm */ + lua_pushvalue(L, -2); /* simgrid simgrid.comm mt simgrid.comm */ /* metatable.__index = simgrid.comm * we put the comm functions inside the comm userdata itself: @@ -203,6 +201,7 @@ void sglua_register_comm_functions(lua_State* L) lua_setfield(L, -2, "__index"); /* simgrid simgrid.comm mt */ lua_setmetatable(L, -2); /* simgrid simgrid.comm */ - lua_pop(L, 2); /* -- */ + lua_setfield(L, -1, "comm"); /* simgrid */ + lua_pop(L, 1); /* -- */ } -- 2.20.1