X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41b4981d5056afade7321f2d913ab89cd45e4afc..f3882bfdbd3264807a5d3a9d1b05424f417f9d28:/src/bindings/lua/simgrid_lua.c diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c index f7ba1494d7..915c5adf1b 100644 --- a/src/bindings/lua/simgrid_lua.c +++ b/src/bindings/lua/simgrid_lua.c @@ -10,7 +10,10 @@ #include #include #include "msg/msg.h" +#include "simdag/simdag.h" +#include #include "xbt.h" +#include "lua_stub_generator.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua,bindings,"Lua Bindings"); @@ -340,7 +343,9 @@ static xbt_dynar_t link_list_d ; static xbt_dynar_t route_list_d ; -//create resource +/** + * create host resource via CPU model [for MSG] + */ static void create_host(const char* id,double power_peak,double power_sc, const char* power_tr,int state_init, @@ -371,6 +376,39 @@ static void create_host(const char* id,double power_peak,double power_sc, } +/* + *create host resource via workstation_ptask_L07 model [for SimDag] + */ +static void create_host_wsL07(const char* id,double power_peak,double power_sc, + const char* power_tr,int state_init, + const char* state_tr) +{ + double power_scale = 1.0; + tmgr_trace_t power_trace = NULL; + e_surf_resource_state_t state_initial; + tmgr_trace_t state_trace; + if(power_sc) // !=0 + power_scale = power_sc; + if (state_init == -1) + state_initial = SURF_RESOURCE_OFF; + else + state_initial = SURF_RESOURCE_ON; + if(power_tr) + power_trace = tmgr_trace_new(power_tr); + else + power_trace = tmgr_trace_new(""); + if(state_tr) + state_trace = tmgr_trace_new(state_tr); + else + state_trace = tmgr_trace_new(""); + current_property_set = xbt_dict_new(); + surf_wsL07_host_create_resource(xbt_strdup(id), power_peak, power_scale, + power_trace, state_initial, state_trace, current_property_set); + +} +/* + * add new host to platform hosts list + */ static int Host_new(lua_State *L) { @@ -440,6 +478,9 @@ static int Host_new(lua_State *L) return 0; } +/** + * add link to platform links list + */ static int Link_new(lua_State *L) // (id,bandwidth,latency) { if(xbt_dynar_is_empty(link_list_d)) @@ -480,6 +521,9 @@ static int Link_new(lua_State *L) // (id,bandwidth,latency) return 0; } +/** + * add route to platform routes list + */ static int Route_new(lua_State *L) // (src_id,dest_id,links_number,link_table) { if(xbt_dynar_is_empty(route_list_d)) @@ -503,6 +547,9 @@ static int Route_new(lua_State *L) // (src_id,dest_id,links_number,link_table) return 0; } +/** + * set function to process + */ static int Host_set_function(lua_State *L) //(host,function,nb_args,list_args) { // look for the index of host in host_list @@ -516,17 +563,20 @@ static int Host_set_function(lua_State *L) //(host,function,nb_args,list_args) if(p_host->id == host_id) { p_host->function = luaL_checkstring(L,2); - p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - // fill the args list - lua_pushnil(L); - int j = 0; - while (lua_next(L,3) != 0) { - argument = lua_tostring(L, -1); - xbt_dynar_push(p_host->args_list, &argument); - DEBUG2("index = %f , Arg_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1)); - j++; - lua_pop(L, 1); - } + if(lua_istable(L,3)) + { + p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + // fill the args list + lua_pushnil(L); + int j = 0; + while (lua_next(L,3) != 0) { + argument = lua_tostring(L, -1); + xbt_dynar_push(p_host->args_list, &argument); + 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; } @@ -537,7 +587,9 @@ static int Host_set_function(lua_State *L) //(host,function,nb_args,list_args) /* * surf parse bypass platform + * through CPU/network Models */ + static int surf_parse_bypass_platform() { unsigned int i; @@ -557,7 +609,7 @@ static int surf_parse_bypass_platform() //add Links xbt_dynar_foreach(link_list_d,i,p_link) { - surf_link_create_resouce((char*)p_link->id,p_link->bandwidth,p_link->latency); + surf_link_create_resource((char*)p_link->id,p_link->bandwidth,p_link->latency); } // add route xbt_dynar_foreach(route_list_d,i,p_route) @@ -572,9 +624,51 @@ static int surf_parse_bypass_platform() return 0; // must return 0 ?!! +} + +/** + * + * surf parse bypass platform + * through workstation_ptask_L07 Model + */ + + +static int surf_wsL07_parse_bypass_platform() +{ + unsigned int i; + p_host_attr p_host; + p_link_attr p_link; + p_route_attr p_route; + + // Add Hosts + xbt_dynar_foreach(host_list_d,i,p_host) + { + create_host_wsL07(p_host->id,p_host->power_peak,p_host->power_scale,p_host->power_trace, + p_host->state_initial,p_host->state_trace); + //add to routing model host list + surf_route_add_host((char*)p_host->id); + } + + //add Links + xbt_dynar_foreach(link_list_d,i,p_link) + { + surf_wsL07_link_create_resource((char*)p_link->id,p_link->bandwidth,p_link->latency); + } + // add route + xbt_dynar_foreach(route_list_d,i,p_route) + { + surf_route_set_resource((char*)p_route->src_id,(char*)p_route->dest_id,p_route->links_id,0); + } + /* */ + + surf_wsL07_add_traces(); + surf_set_routes(); + + return 0; + } /* - * surf parse bypass application + * surf parse bypass application for MSG Module */ static int surf_parse_bypass_application() { @@ -588,6 +682,77 @@ static int surf_parse_bypass_application() return 0; } + +/** + * Generate Gras Templates File from lua + */ + +xbt_dict_t process_function_set; +xbt_dynar_t process_list; +xbt_dict_t machine_set; +static s_process_t process; + +void s_process_free(void *process) +{ + s_process_t *p = (s_process_t *) process; + int i; + for (i = 0; i < p->argc; i++) + free(p->argv[i]); + free(p->argv); + free(p->host); +} + +static int gras_add_process_function(lua_State *L) +{ + const char * arg; + const char* process_host = luaL_checkstring(L,1); + const char *process_function = luaL_checkstring(L,2); + + if(xbt_dict_is_empty(machine_set) || xbt_dict_is_empty(process_function_set) + || xbt_dynar_is_empty(process_list)) + { + process_function_set = xbt_dict_new(); + process_list = xbt_dynar_new(sizeof(s_process_t), s_process_free); + machine_set = xbt_dict_new(); + } + + xbt_dict_set(machine_set,process_host, NULL, NULL); + xbt_dict_set(process_function_set,process_function, NULL, NULL); + + process.argc = 1; + process.argv = xbt_new(char *, 1); + process.argv[0] = xbt_strdup(process_function); + process.host = strdup(process_host); + + lua_pushnil(L); + while (lua_next(L,3) != 0) { + arg = lua_tostring(L, -1); + process.argc++; + process.argv = xbt_realloc(process.argv, (process.argc) * sizeof(char *)); + process.argv[(process.argc) - 1] = xbt_strdup(arg); + + DEBUG2("index = %f , arg = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1)); + lua_pop(L, 1); + } + lua_pop(L, 1); + //add to the process list + xbt_dynar_push(process_list, &process); + + return 0; + +} + + +static int gras_generate(lua_State *L) +{ + const char *project_name = luaL_checkstring(L,1); + generate_sim(project_name); + generate_rl(project_name); + generate_makefile_local(project_name); + + return 0; +} + //***********Register Methods *******************************************// /* * Host Methods @@ -715,7 +880,11 @@ static int clean(lua_State *L) { /* * Bypass XML Parser */ -static int register_platform(lua_State *L) + +/* + * Register platform for MSG + */ +static int msg_register_platform(lua_State *L) { /* Tell Simgrid we dont wanna use its parser*/ surf_parse = surf_parse_bypass_platform; @@ -723,7 +892,31 @@ static int register_platform(lua_State *L) return 0; } -static int register_application(lua_State *L) +/* + * Register platform for Simdag + */ + +static int sd_register_platform(lua_State *L) +{ + surf_parse = surf_wsL07_parse_bypass_platform; + SD_create_environment(NULL); + return 0; +} +/* + * Register platform for gras + */ +static int gras_register_platform(lua_State *L) +{ + /* Tell Simgrid we dont wanna use surf parser*/ + surf_parse = surf_parse_bypass_platform; + gras_create_environment(NULL); + return 0; +} + +/** + * Register applicaiton for MSG + */ +static int msg_register_application(lua_State *L) { MSG_function_register_default(run_lua_code); surf_parse = surf_parse_bypass_application; @@ -731,6 +924,16 @@ static int register_application(lua_State *L) return 0; } +/* + * Register application for gras + */ +static int gras_register_application(lua_State *L) +{ + gras_function_register_default(run_lua_code); + surf_parse = surf_parse_bypass_application; + gras_launch_application(NULL); + return 0; +} static const luaL_Reg simgrid_funcs[] = { { "create_environment", create_environment}, { "launch_application", launch_application}, @@ -742,8 +945,14 @@ static const luaL_Reg simgrid_funcs[] = { { "platform", create_environment}, { "application", launch_application}, /* methods to bypass XML parser*/ - { "register_platform",register_platform}, - { "register_application",register_application}, + { "msg_register_platform",msg_register_platform}, + { "sd_register_platform",sd_register_platform}, + { "msg_register_application",msg_register_application}, + { "gras_register_platform",gras_register_platform}, + { "gras_register_application",gras_register_application}, + /* gras sub generator method*/ + {"gras_set_process_function",gras_add_process_function}, + {"gras_generate",gras_generate}, { NULL, NULL } };