From 8cbacd4f34e350b80e7a5af442af13505f6cc14f Mon Sep 17 00:00:00 2001 From: coldpeace Date: Fri, 21 May 2010 14:24:38 +0000 Subject: [PATCH] tricky way to bypass XML parser and setup the environment from lua code git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7791 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/lua/master_slave_bypass.lua | 132 +++++++++ examples/lua/master_slave_bypass.tesh | 133 +++++++++ src/bindings/lua/simgrid_lua.c | 376 +++++++++++++++++++++++++- 3 files changed, 637 insertions(+), 4 deletions(-) create mode 100644 examples/lua/master_slave_bypass.lua create mode 100644 examples/lua/master_slave_bypass.tesh diff --git a/examples/lua/master_slave_bypass.lua b/examples/lua/master_slave_bypass.lua new file mode 100644 index 0000000000..1b9b740026 --- /dev/null +++ b/examples/lua/master_slave_bypass.lua @@ -0,0 +1,132 @@ +--Master Function +function Master(...) + +simgrid.info("Hello from lua, I'm the master") +for i,v in ipairs(arg) do + simgrid.info("Got "..v) +end + +nb_task = arg[1]; +comp_size = arg[2]; +comm_size = arg[3]; +slave_count = arg[4] + + +if (#arg ~= 4) then + error("Argc should be 4"); +end +simgrid.info("Argc="..(#arg).." (should be 4)") + +-- Dispatch the tasks + +for i=1,nb_task do + tk = simgrid.Task.new("Task "..i,comp_size,comm_size); + alias = "slave "..(i%slave_count); + simgrid.info("Master sending '" .. simgrid.Task.name(tk) .."' To '" .. alias .."'"); + simgrid.Task.send(tk,alias); -- C user data set to NULL + simgrid.info("Master done sending '".. simgrid.Task.name(tk) .."' To '" .. alias .."'"); +end + +-- Sending Finalize Message To Others + +simgrid.info("Master: All tasks have been dispatched. Let's tell everybody the computation is over."); +for i=0,slave_count-1 do + alias = "slave "..i; + simgrid.info("Master: sending finalize to "..alias); + finalize = simgrid.Task.new("finalize",comp_size,comm_size); + simgrid.Task.send(finalize,alias) +end + simgrid.info("Master: Everything's done."); +end + +-- Slave Function --------------------------------------------------------- +function Slave(...) + +local my_mailbox="slave "..arg[1] +simgrid.info("Hello from lua, I'm a poor slave with mbox: "..my_mailbox) + +while true do + + local tk = simgrid.Task.recv(my_mailbox); + if (simgrid.Task.name(tk) == "finalize") then + simgrid.info("Slave '" ..my_mailbox.."' got finalize msg"); + break + end + --local tk_name = simgrid.Task.name(tk) + simgrid.info("Slave '" ..my_mailbox.."' processing "..simgrid.Task.name(tk)) + simgrid.Task.execute(tk) + simgrid.info("Slave '" ..my_mailbox.."': task "..simgrid.Task.name(tk) .. " done") +end -- while + +simgrid.info("Slave '" ..my_mailbox.."': I'm Done . See You !!"); + +end -- function ---------------------------------------------------------- +--]] + +require "simgrid" + + --first we save the host number ( since we'll first save them into a C table ) + simgrid.Host.setNumber(5); + --simgrid.Host.new(host_id,power) + simgrid.Host.new("Tremblay",98095000); + simgrid.Host.new("Jupiter",76296000); + simgrid.Host.new("Fafard",76296000); + simgrid.Host.new("Ginette",48492000); + simgrid.Host.new("Bourassa",48492000); + + -- set Number of links + simgrid.Link.setNumber(12); + -- create Links + for i=0,11 do + simgrid.Link.new(i,252750+ i*768,0.000270544+i*0.087); -- let's create link !! with crazy values ;) + end + + -- set number of route ( 5 hosts >> 5*5 = 25 ) + simgrid.Route.setNumber(20); + + -- simgrid.Route.new(src_id,des_id,links_nb,links_list) + simgrid.Route.new("Tremblay","Jupiter",1,{"1"}); + simgrid.Route.new("Tremblay","Fafard",6,{"0","1","2","3","4","8"}); + simgrid.Route.new("Tremblay","Ginette",3,{"3","4","5"}); + simgrid.Route.new("Tremblay","Bourassa",7,{"0","1","3","2","4","6","7"}); + + simgrid.Route.new("Jupiter","Tremblay",1,{"1"}); + simgrid.Route.new("Jupiter","Fafard",7,{"0","1","2","3","4","8","9"}); + simgrid.Route.new("Jupiter","Ginette",4,{"3","4","5","9"}); + simgrid.Route.new("Jupiter","Bourassa",8,{"0","1","2","3","4","6","7","9"}); + + simgrid.Route.new("Fafard","Tremblay",6,{"0","1","2","3","4","8"}); + simgrid.Route.new("Fafard","Jupiter",7,{"0","1","2","3","4","8","9"}); + simgrid.Route.new("Fafard","Ginette",5,{"0","1","2","5","8"}); + simgrid.Route.new("Fafard","Bourassa",3,{"6","7","8"}); + + simgrid.Route.new("Ginette","Tremblay",3,{"3","4","5"}); + simgrid.Route.new("Ginette","Jupiter",4,{"3","4","5","9"}); + simgrid.Route.new("Ginette","Fafard",5,{"0","1","2","5","8"}); + simgrid.Route.new("Ginette","Bourassa",6,{"0","1","2","5","6","7"}); + + simgrid.Route.new("Bourassa","Tremblay",7,{"0","1","3","2","4","6","7"}); + simgrid.Route.new("Bourassa","Jupiter",8,{"0","1","2","3","4","6","7","9"}); + simgrid.Route.new("Bourassa","Fafard",3,{"6","7","8"}); + simgrid.Route.new("Bourassa","Ginette",6,{"0","1","2","5","6","7"}); + + --Save Platform + simgrid.register_platform(); + + --Set Application + + --simgrid.Host.setFunction(host_id,function_name,args_nb,args_list) + simgrid.Host.setFunction("Tremblay","Master",4,{"20","550000000","1000000","4"}); + simgrid.Host.setFunction("Bourassa","Slave",1,{"0"}); + simgrid.Host.setFunction("Jupiter","Slave",1,{"1"}); + simgrid.Host.setFunction("Fafard","Slave",1,{"2"}); + simgrid.Host.setFunction("Ginette","Slave",1,{"3"}); + + --Save Application + simgrid.register_application(); + +-- Run The Application + + simgrid.run() + simgrid.info("Simulation's over.See you.") + simgrid.clean() \ No newline at end of file diff --git a/examples/lua/master_slave_bypass.tesh b/examples/lua/master_slave_bypass.tesh new file mode 100644 index 0000000000..a9dcd3765b --- /dev/null +++ b/examples/lua/master_slave_bypass.tesh @@ -0,0 +1,133 @@ +# compile the master_slave_bypass example + +$ lua master_slave_bypass.lua +> [0.000000] /home/mehdi/workspace/Simgrid/src/surf/surfxml_parse.c:435: [surf_parse/WARNING] Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. +> [Tremblay:Master:(1) 0.000000] [lua/INFO] Hello from lua, I'm the master +> [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 20 +> [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 550000000 +> [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 1000000 +> [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 4 +> [Tremblay:Master:(1) 0.000000] [lua/INFO] Argc=4 (should be 4) +> [Tremblay:Master:(1) 0.000000] [lua/INFO] Creating task +> [Tremblay:Master:(1) 0.000000] [lua/INFO] Master sending 'Task 1' To 'slave 1' +> [Jupiter:Slave:(2) 0.000000] [lua/INFO] Hello from lua, I'm a poor slave with mbox: slave 1 +> [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.634718] [lua/INFO] Slave 'slave 1' processing Task 1 +> [Tremblay:Master:(1) 9.634718] [lua/INFO] Master done sending 'Task 1' To 'slave 1' +> [Tremblay:Master:(1) 9.634718] [lua/INFO] Creating task +> [Tremblay:Master:(1) 9.634718] [lua/INFO] Master sending 'Task 2' To 'slave 2' +> [Jupiter:Slave:(2) 16.843484] [lua/INFO] Slave 'slave 1': task Task 1 done +> [Fafard:Slave:(3) 182.700629] [lua/INFO] Slave 'slave 2' processing Task 2 +> [Tremblay:Master:(1) 182.700629] [lua/INFO] Master done sending 'Task 2' To 'slave 2' +> [Tremblay:Master:(1) 182.700629] [lua/INFO] Creating task +> [Tremblay:Master:(1) 182.700629] [lua/INFO] Master sending 'Task 3' To 'slave 3' +> [Fafard:Slave:(3) 189.909395] [lua/INFO] Slave 'slave 2': task Task 2 done +> [Ginette:Slave:(4) 298.047984] [lua/INFO] Slave 'slave 3' processing Task 3 +> [Tremblay:Master:(1) 298.047984] [lua/INFO] Master done sending 'Task 3' To 'slave 3' +> [Tremblay:Master:(1) 298.047984] [lua/INFO] Creating task +> [Tremblay:Master:(1) 298.047984] [lua/INFO] Master sending 'Task 4' To 'slave 0' +> [Ginette:Slave:(4) 309.390061] [lua/INFO] Slave 'slave 3': task Task 3 done +> [Bourassa:Slave:(5) 519.167813] [lua/INFO] Slave 'slave 0' processing Task 4 +> [Tremblay:Master:(1) 519.167813] [lua/INFO] Master done sending 'Task 4' To 'slave 0' +> [Tremblay:Master:(1) 519.167813] [lua/INFO] Creating task +> [Tremblay:Master:(1) 519.167813] [lua/INFO] Master sending 'Task 5' To 'slave 1' +> [Jupiter:Slave:(2) 528.802531] [lua/INFO] Slave 'slave 1' processing Task 5 +> [Tremblay:Master:(1) 528.802531] [lua/INFO] Master done sending 'Task 5' To 'slave 1' +> [Tremblay:Master:(1) 528.802531] [lua/INFO] Creating task +> [Tremblay:Master:(1) 528.802531] [lua/INFO] Master sending 'Task 6' To 'slave 2' +> [Bourassa:Slave:(5) 530.509890] [lua/INFO] Slave 'slave 0': task Task 4 done +> [Jupiter:Slave:(2) 536.011297] [lua/INFO] Slave 'slave 1': task Task 5 done +> [Fafard:Slave:(3) 701.868442] [lua/INFO] Slave 'slave 2' processing Task 6 +> [Tremblay:Master:(1) 701.868442] [lua/INFO] Master done sending 'Task 6' To 'slave 2' +> [Tremblay:Master:(1) 701.868442] [lua/INFO] Creating task +> [Tremblay:Master:(1) 701.868442] [lua/INFO] Master sending 'Task 7' To 'slave 3' +> [Fafard:Slave:(3) 709.077207] [lua/INFO] Slave 'slave 2': task Task 6 done +> [Ginette:Slave:(4) 817.215797] [lua/INFO] Slave 'slave 3' processing Task 7 +> [Tremblay:Master:(1) 817.215797] [lua/INFO] Master done sending 'Task 7' To 'slave 3' +> [Tremblay:Master:(1) 817.215797] [lua/INFO] Creating task +> [Tremblay:Master:(1) 817.215797] [lua/INFO] Master sending 'Task 8' To 'slave 0' +> [Ginette:Slave:(4) 828.557874] [lua/INFO] Slave 'slave 3': task Task 7 done +> [Bourassa:Slave:(5) 1038.335626] [lua/INFO] Slave 'slave 0' processing Task 8 +> [Tremblay:Master:(1) 1038.335626] [lua/INFO] Master done sending 'Task 8' To 'slave 0' +> [Tremblay:Master:(1) 1038.335626] [lua/INFO] Creating task +> [Tremblay:Master:(1) 1038.335626] [lua/INFO] Master sending 'Task 9' To 'slave 1' +> [Jupiter:Slave:(2) 1047.970344] [lua/INFO] Slave 'slave 1' processing Task 9 +> [Tremblay:Master:(1) 1047.970344] [lua/INFO] Master done sending 'Task 9' To 'slave 1' +> [Tremblay:Master:(1) 1047.970344] [lua/INFO] Creating task +> [Tremblay:Master:(1) 1047.970344] [lua/INFO] Master sending 'Task 10' To 'slave 2' +> [Bourassa:Slave:(5) 1049.677703] [lua/INFO] Slave 'slave 0': task Task 8 done +> [Jupiter:Slave:(2) 1055.179110] [lua/INFO] Slave 'slave 1': task Task 9 done +> [Fafard:Slave:(3) 1221.036254] [lua/INFO] Slave 'slave 2' processing Task 10 +> [Tremblay:Master:(1) 1221.036254] [lua/INFO] Master done sending 'Task 10' To 'slave 2' +> [Tremblay:Master:(1) 1221.036254] [lua/INFO] Creating task +> [Tremblay:Master:(1) 1221.036254] [lua/INFO] Master sending 'Task 11' To 'slave 3' +> [Fafard:Slave:(3) 1228.245020] [lua/INFO] Slave 'slave 2': task Task 10 done +> [Ginette:Slave:(4) 1336.383610] [lua/INFO] Slave 'slave 3' processing Task 11 +> [Tremblay:Master:(1) 1336.383610] [lua/INFO] Master done sending 'Task 11' To 'slave 3' +> [Tremblay:Master:(1) 1336.383610] [lua/INFO] Creating task +> [Tremblay:Master:(1) 1336.383610] [lua/INFO] Master sending 'Task 12' To 'slave 0' +> [Ginette:Slave:(4) 1347.725687] [lua/INFO] Slave 'slave 3': task Task 11 done +> [Bourassa:Slave:(5) 1557.503438] [lua/INFO] Slave 'slave 0' processing Task 12 +> [Tremblay:Master:(1) 1557.503438] [lua/INFO] Master done sending 'Task 12' To 'slave 0' +> [Tremblay:Master:(1) 1557.503438] [lua/INFO] Creating task +> [Tremblay:Master:(1) 1557.503438] [lua/INFO] Master sending 'Task 13' To 'slave 1' +> [Jupiter:Slave:(2) 1567.138157] [lua/INFO] Slave 'slave 1' processing Task 13 +> [Tremblay:Master:(1) 1567.138157] [lua/INFO] Master done sending 'Task 13' To 'slave 1' +> [Tremblay:Master:(1) 1567.138157] [lua/INFO] Creating task +> [Tremblay:Master:(1) 1567.138157] [lua/INFO] Master sending 'Task 14' To 'slave 2' +> [Bourassa:Slave:(5) 1568.845515] [lua/INFO] Slave 'slave 0': task Task 12 done +> [Jupiter:Slave:(2) 1574.346923] [lua/INFO] Slave 'slave 1': task Task 13 done +> [Fafard:Slave:(3) 1740.204067] [lua/INFO] Slave 'slave 2' processing Task 14 +> [Tremblay:Master:(1) 1740.204067] [lua/INFO] Master done sending 'Task 14' To 'slave 2' +> [Tremblay:Master:(1) 1740.204067] [lua/INFO] Creating task +> [Tremblay:Master:(1) 1740.204067] [lua/INFO] Master sending 'Task 15' To 'slave 3' +> [Fafard:Slave:(3) 1747.412833] [lua/INFO] Slave 'slave 2': task Task 14 done +> [Ginette:Slave:(4) 1855.551422] [lua/INFO] Slave 'slave 3' processing Task 15 +> [Tremblay:Master:(1) 1855.551422] [lua/INFO] Master done sending 'Task 15' To 'slave 3' +> [Tremblay:Master:(1) 1855.551422] [lua/INFO] Creating task +> [Tremblay:Master:(1) 1855.551422] [lua/INFO] Master sending 'Task 16' To 'slave 0' +> [Ginette:Slave:(4) 1866.893499] [lua/INFO] Slave 'slave 3': task Task 15 done +> [Bourassa:Slave:(5) 2076.671251] [lua/INFO] Slave 'slave 0' processing Task 16 +> [Tremblay:Master:(1) 2076.671251] [lua/INFO] Master done sending 'Task 16' To 'slave 0' +> [Tremblay:Master:(1) 2076.671251] [lua/INFO] Creating task +> [Tremblay:Master:(1) 2076.671251] [lua/INFO] Master sending 'Task 17' To 'slave 1' +> [Jupiter:Slave:(2) 2086.305970] [lua/INFO] Slave 'slave 1' processing Task 17 +> [Tremblay:Master:(1) 2086.305970] [lua/INFO] Master done sending 'Task 17' To 'slave 1' +> [Tremblay:Master:(1) 2086.305970] [lua/INFO] Creating task +> [Tremblay:Master:(1) 2086.305970] [lua/INFO] Master sending 'Task 18' To 'slave 2' +> [Bourassa:Slave:(5) 2088.013328] [lua/INFO] Slave 'slave 0': task Task 16 done +> [Jupiter:Slave:(2) 2093.514735] [lua/INFO] Slave 'slave 1': task Task 17 done +> [Fafard:Slave:(3) 2259.371880] [lua/INFO] Slave 'slave 2' processing Task 18 +> [Tremblay:Master:(1) 2259.371880] [lua/INFO] Master done sending 'Task 18' To 'slave 2' +> [Tremblay:Master:(1) 2259.371880] [lua/INFO] Creating task +> [Tremblay:Master:(1) 2259.371880] [lua/INFO] Master sending 'Task 19' To 'slave 3' +> [Fafard:Slave:(3) 2266.580646] [lua/INFO] Slave 'slave 2': task Task 18 done +> [Ginette:Slave:(4) 2374.719235] [lua/INFO] Slave 'slave 3' processing Task 19 +> [Tremblay:Master:(1) 2374.719235] [lua/INFO] Master done sending 'Task 19' To 'slave 3' +> [Tremblay:Master:(1) 2374.719235] [lua/INFO] Creating task +> [Tremblay:Master:(1) 2374.719235] [lua/INFO] Master sending 'Task 20' To 'slave 0' +> [Ginette:Slave:(4) 2386.061312] [lua/INFO] Slave 'slave 3': task Task 19 done +> [Bourassa:Slave:(5) 2595.839064] [lua/INFO] Slave 'slave 0' processing Task 20 +> [Tremblay:Master:(1) 2595.839064] [lua/INFO] Master done sending 'Task 20' To 'slave 0' +> [Tremblay:Master:(1) 2595.839064] [lua/INFO] Master: All tasks have been dispatched. Let's tell everybody the computation is over. +> [Tremblay:Master:(1) 2595.839064] [lua/INFO] Master: sending finalize to slave 0 +> [Tremblay:Master:(1) 2595.839064] [lua/INFO] Creating task +> [Bourassa:Slave:(5) 2607.181141] [lua/INFO] Slave 'slave 0': task Task 20 done +> [Bourassa:Slave:(5) 2828.300970] [lua/INFO] Slave 'slave 0' got finalize msg +> [Bourassa:Slave:(5) 2828.300970] [lua/INFO] Slave 'slave 0': I'm Done . See You !! +> [Tremblay:Master:(1) 2828.300970] [lua/INFO] Master: sending finalize to slave 1 +> [Tremblay:Master:(1) 2828.300970] [lua/INFO] Creating task +> [Jupiter:Slave:(2) 2837.935688] [lua/INFO] Slave 'slave 1' got finalize msg +> [Jupiter:Slave:(2) 2837.935688] [lua/INFO] Slave 'slave 1': I'm Done . See You !! +> [Tremblay:Master:(1) 2837.935688] [lua/INFO] Master: sending finalize to slave 2 +> [Tremblay:Master:(1) 2837.935688] [lua/INFO] Creating task +> [Fafard:Slave:(3) 3011.001599] [lua/INFO] Slave 'slave 2' got finalize msg +> [Fafard:Slave:(3) 3011.001599] [lua/INFO] Slave 'slave 2': I'm Done . See You !! +> [Tremblay:Master:(1) 3011.001599] [lua/INFO] Master: sending finalize to slave 3 +> [Tremblay:Master:(1) 3011.001599] [lua/INFO] Creating task +> [Ginette:Slave:(4) 3126.348954] [lua/INFO] Slave 'slave 3' got finalize msg +> [Ginette:Slave:(4) 3126.348954] [lua/INFO] Slave 'slave 3': I'm Done . See You !! +> [Tremblay:Master:(1) 3126.348954] [lua/INFO] Master: Everything's done. +> [3126.348954] [lua/INFO] Simulation's over.See you. diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c index 6760fa2aeb..a4a2979569 100644 --- a/src/bindings/lua/simgrid_lua.c +++ b/src/bindings/lua/simgrid_lua.c @@ -9,7 +9,6 @@ #include #include #include - #include "msg/msg.h" #include "xbt.h" @@ -17,6 +16,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua,bindings,"Lua Bindings"); #define TASK_MODULE_NAME "simgrid.Task" #define HOST_MODULE_NAME "simgrid.Host" +// Surf ( bypass XML ) +#define LINK_MODULE_NAME "simgrid.Link" +#define ROUTE_MODULE_NAME "simgrid.Route" /* ********************************************************************************* */ /* helper functions */ @@ -32,7 +34,6 @@ static void stackDump (const char *msg, lua_State *L) { p+=sprintf(p,"STACK(top=%d): ",top); for (i = 1; i <= top; i++) { /* repeat for each level */ - int t = lua_type(L, i); switch (t) { @@ -146,6 +147,7 @@ static int Task_destroy(lua_State *L) { lua_pushnumber(L,res); return 1; } + static int Task_send(lua_State *L) { //stackDump("send ",L); m_task_t tk = checkTask(L,-2); @@ -244,7 +246,6 @@ static m_host_t checkHost (lua_State *L,int index) { return ht; } - static int Host_get_by_name(lua_State *L) { const char *name=luaL_checkstring(L,1); @@ -277,11 +278,327 @@ static int Host_number(lua_State *L) { return 1; } +static int Host_at(lua_State *L) +{ + int index = luaL_checkinteger(L,1); + m_host_t host = MSG_get_host_table()[index-1]; // lua indexing start by 1 (lua[1] <=> C[0]) + lua_newtable (L); /* create a table, put the userdata on top of it */ + m_host_t *lua_host = (m_host_t*)lua_newuserdata(L,sizeof(m_host_t)); + *lua_host = host; + luaL_getmetatable(L,HOST_MODULE_NAME); + lua_setmetatable(L,-2); + lua_setfield (L, -2, "__simgrid_host"); /* put the userdata as field of the table */ + return 1; + +} + +/***************************************************************************************** + * BYPASS XML SURF Methods * + *************************** + *************************** +******************************************************************************************/ +#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ +typedef struct t_host_attr +{ + //platform attribute + const char* id; + double power; + //deployment attribute + const char* function; + int args_nb; + const char ** args_list; +}host_attr,*p_host_attr; + +typedef struct t_link_attr +{ + const char* id; + double bandwidth; + double latency; +}link_attr,*p_link_attr; + +typedef struct t_route_attr +{ + const char *src_id; + const char *dest_id; + int links_nb; + const char **links_id; + +}route_attr,*p_route_attr; + + +static int host_index = 0; +static int link_index = 0; +static int route_index = 0; + +static int max_host_number = 0; +static int max_link_number = 0; +static int max_route_number = 0; + +static p_host_attr* host_list; +static p_link_attr* link_list; +static p_route_attr* route_list; + +static int Host_set_number(lua_State *L) +{ + max_host_number = luaL_checkint(L,1); + host_list = malloc(sizeof(host_attr)*max_host_number); + return 0; +} + +static int Link_set_number(lua_State *L) +{ + max_link_number = luaL_checkint(L,1); + link_list = malloc(sizeof(link_attr)*max_link_number); + return 0; +} + +static int Route_set_number(lua_State *L) +{ + max_route_number = luaL_checkint(L,1); + route_list = malloc(sizeof(route_attr)*max_link_number); + return 0; +} + +static int Host_new(lua_State *L) //(id,power) +{ + p_host_attr host = malloc(sizeof(host_attr)); + host->id = luaL_checkstring(L,1); + host->power = luaL_checknumber(L,2); + if(host_index >= max_host_number) + ERROR1("max host number:%d reached !!!",max_host_number); + host_list[host_index] = host; + host_list[host_index]->function = NULL; + host_index++; + return 0; +} + +static int Link_new(lua_State *L) // (id,bandwidth,latency) +{ + + p_link_attr link = malloc(sizeof(link_attr)); + link->id = luaL_checkstring(L,1); + link->bandwidth = luaL_checknumber(L,2); + link->latency = luaL_checknumber(L,3); + if(link_index >= max_link_number) + ERROR1("max link number: %d reached !!!",max_link_number); + link_list[link_index] = link; + link_index++; + return 0; +} + +static int Route_new(lua_State *L) // (src_id,dest_id,links_number,link_table) +{ + int i=0; + p_route_attr route = malloc(sizeof(route_attr)); + route->src_id = luaL_checkstring(L,1); + route->dest_id = luaL_checkstring(L,2); + route->links_nb = luaL_checkint(L,3); + route->links_id = malloc(sizeof(char*)*route->links_nb); + lua_pushnil(L); + while (lua_next(L,4) != 0) { + if(i >= route->links_nb) + ERROR1("Number of links should be less than %d",route->links_nb+1); + route->links_id[i] = lua_tostring(L, -1); + DEBUG2("index = %f , Link_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1)); + i++; + lua_pop(L, 1); + } + lua_pop(L, 1); + + //add route to platform's route list + if(route_index >= max_route_number) + ERROR1("max route number: %d reached !!!",max_route_number); + route_list[route_index] = route; + route_index++; + return 0; +} + +static int Host_set_function(lua_State *L) //(host,function,nb_args,list_args) +{ + // look for the index of host in host_list + const char *host_id = luaL_checkstring(L,1); + int i; + for(i=0;i< host_index;i++) + { + if(host_list[i]->id == host_id) + { + host_list[i]->function = luaL_checkstring(L,2); + host_list[i]->args_nb = luaL_checkint(L,3); + host_list[i]->args_list = malloc(sizeof(char*)*host_list[i]->args_nb); + // fill the args list + lua_pushnil(L); + int j = 0; + while (lua_next(L,4) != 0) { + if(j >= host_list[i]->args_nb) + ERROR1("Number of args should be less than %d",host_list[i]->args_nb+1); + host_list[i]->args_list[j] = lua_tostring(L, -1); + DEBUG2("index = %f , Arg_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1)); + j++; + lua_pop(L, 1); + } + lua_pop(L, 1); + return 0; + } + } + ERROR1("Host : %s Not Fount !!",host_id); + return 1; +} + + +/* + * surf parse bypass platform + */ +static int surf_parse_bypass_platform() +{ + static int AX_ptr = 0; + static int surfxml_bufferstack_size = 2048; + /* FIXME allocating memory for the buffer, I think 2kB should be enough */ + surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); + /* */ + SURFXML_BUFFER_SET(platform_version, "2"); + SURFXML_START_TAG(platform); + char buffer[22]; + int i; + + // Add Host + for(i=0;iid); + sprintf(buffer, "%f", host_list[i]->power); + SURFXML_BUFFER_SET(host_power,buffer); + SURFXML_BUFFER_SET(host_availability, "1.0"); + SURFXML_BUFFER_SET(host_availability_file, ""); + A_surfxml_host_state = A_surfxml_host_state_ON; + SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_interference_send, "1.0"); + SURFXML_BUFFER_SET(host_interference_recv, "1.0"); + SURFXML_BUFFER_SET(host_interference_send_recv, "1.0"); + SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0"); + SURFXML_START_TAG(host); + SURFXML_END_TAG(host); + } + + //add Host + for (i = 0;iid); + sprintf(buffer,"%f",link_list[i]->bandwidth); + SURFXML_BUFFER_SET(link_bandwidth,buffer); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + sprintf(buffer,"%f",link_list[i]->latency); + SURFXML_BUFFER_SET(link_latency,buffer); + SURFXML_BUFFER_SET(link_latency_file, ""); + A_surfxml_link_state = A_surfxml_link_state_ON; + SURFXML_BUFFER_SET(link_state_file, ""); + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); + } + + // add route + + for (i = 0;isrc_id); + SURFXML_BUFFER_SET(route_dst,route_list[i]->dest_id); + SURFXML_BUFFER_SET(route_impact_on_src, "0.0"); + SURFXML_BUFFER_SET(route_impact_on_dst, "0.0"); + SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0"); + SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0"); + SURFXML_START_TAG(route); + int j; + + for(j=0; j < route_list[i]->links_nb;j++) + { + SURFXML_BUFFER_SET(link_c_ctn_id,route_list[i]->links_id[j]); + SURFXML_START_TAG(link_c_ctn); + SURFXML_END_TAG(link_c_ctn); + } + + SURFXML_END_TAG(route); + } + /* */ + + SURFXML_END_TAG(platform); + free(surfxml_bufferstack); + return 0; // must return 0 ?!! + +} + +/* + * surf parse bypass application + */ +static int surf_parse_bypass_application() +{ + int i; + static int AX_ptr; + static int surfxml_bufferstack_size = 2048; + /* FIXME ( should be manual )allocating memory to the buffer, I think 2MB should be enough */ + surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); + /* */ + + SURFXML_BUFFER_SET(platform_version, "2"); + + SURFXML_START_TAG(platform); + + for(i=0 ; i< host_index ;i++) + { + if(host_list[i]->function) + { + SURFXML_BUFFER_SET(process_host, host_list[i]->id); + SURFXML_BUFFER_SET(process_function, host_list[i]->function); + SURFXML_BUFFER_SET(process_start_time, "-1.0"); + SURFXML_BUFFER_SET(process_kill_time, "-1.0"); + SURFXML_START_TAG(process); + + //args + int j; + for(j=0 ;jargs_nb;j++) + { + SURFXML_BUFFER_SET(argument_value, host_list[i]->args_list[j]); + SURFXML_START_TAG(argument); + SURFXML_END_TAG(argument); + } + SURFXML_END_TAG(process); + } + + } + /* */ + SURFXML_END_TAG(platform); + free(surfxml_bufferstack); + return 0; +} + +// Free Allocated Memory +static void clean_attr() +{ + // free hosts + int i; + for(i = 0;iargs_list); + + free(host_list); + free(link_list); + + for(i=0;ilinks_id); + + free(route_list); +} +//***********Register Methods *******************************************// +/* + * Host Methods + */ static const luaL_reg Host_methods[] = { {"getByName", Host_get_by_name}, {"name", Host_get_name}, {"number", Host_number}, + {"at", Host_at}, + // Bypass XML Methods + {"new", Host_new}, + {"setNumber", Host_set_number}, + {"setFunction", Host_set_function}, {0,0} }; @@ -304,9 +621,26 @@ static const luaL_reg Host_meta[] = { {0,0} }; +/* + * Link Methods + */ +static const luaL_reg Link_methods[] = { + {"new",Link_new}, + {"setNumber", Link_set_number }, + {0,0} +}; +/* + * Route Methods + */ +static const luaL_reg Route_methods[] ={ + {"new",Route_new}, + {"setNumber",Route_set_number} +}; + /* * Environment related */ + extern lua_State *simgrid_lua_state; static int run_lua_code(int argc,char **argv) { @@ -359,6 +693,7 @@ static int create_environment(lua_State *L) { return 0; } + static int debug(lua_State *L) { const char *str = luaL_checkstring(L,1); DEBUG1("%s",str); @@ -374,9 +709,30 @@ static int run(lua_State *L) { return 0; } static int clean(lua_State *L) { + clean_attr(); // in case of using "bypass xml" methods MSG_clean(); return 0; } + +/* + * Bypass XML Pareser + */ +static int register_platform(lua_State *L) +{ + /* Tell Simgrid we dont wanna use its parser*/ + surf_parse = surf_parse_bypass_platform; + MSG_create_environment(NULL); + return 0; +} + +static int register_application(lua_State *L) +{ + MSG_function_register_default(run_lua_code); + surf_parse = surf_parse_bypass_application; + MSG_launch_application(NULL); + return 0; +} + static const luaL_Reg simgrid_funcs[] = { { "create_environment", create_environment}, { "launch_application", launch_application}, @@ -387,6 +743,9 @@ static const luaL_Reg simgrid_funcs[] = { /* short names */ { "platform", create_environment}, { "application", launch_application}, + /* methods to bypass XML parser*/ + { "register_platform",register_platform}, + { "register_application",register_application}, { NULL, NULL } }; @@ -457,8 +816,17 @@ int luaopen_simgrid(lua_State* L) { lua_rawset(L,-3); lua_pop(L,1); + /* register the links methods to lua*/ + luaL_openlib(L,LINK_MODULE_NAME,Link_methods,0); + luaL_newmetatable(L,LINK_MODULE_NAME); + lua_pop(L,1); + + /*register the routes methods to lua*/ + luaL_openlib(L,ROUTE_MODULE_NAME,Route_methods,0); + luaL_newmetatable(L,LINK_MODULE_NAME); + lua_pop(L,1); + /* Keep the context mechanism informed of our lua world today */ simgrid_lua_state = L; - return 1; } -- 2.20.1