X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ead8ae15aae17b661bb20818af9f42f1b30e3d6..d947ff7466b473eeec602007934f8336a9b17f3c:/src/bindings/lua/lua_platf.c diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c index 279bf65534..7514c7121d 100644 --- a/src/bindings/lua/lua_platf.c +++ b/src/bindings/lua/lua_platf.c @@ -14,6 +14,10 @@ #include #include +#include +#include +#include + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, bindings, "Lua bindings (platform module)"); #define PLATF_MODULE_NAME "simgrid.platf" @@ -38,8 +42,12 @@ int console_open(lua_State *L) { sg_platf_init(); sg_platf_begin(); surf_parse_init_callbacks(); + + storage_register_callbacks(); routing_register_callbacks(); + gpu_register_callbacks(); + return 0; } @@ -88,30 +96,35 @@ int console_add_host(lua_State *L) { host.power_peak = lua_tonumber(L, -1); lua_pop(L, 1); + // get core + lua_pushstring(L, "core"); + lua_gettable(L, -2); + if(!lua_isnumber(L,-1)) host.core_amount = 1;// Default value + else host.core_amount = lua_tonumber(L, -1); + if (host.core_amount == 0) + host.core_amount = 1; + lua_pop(L, 1); + //get power_scale lua_pushstring(L, "power_scale"); lua_gettable(L, -2); - host.power_scale = lua_tonumber(L, -1); + if(!lua_isnumber(L,-1)) host.power_scale = 1;// Default value + else host.power_scale = lua_tonumber(L, -1); lua_pop(L, 1); //get power_trace lua_pushstring(L, "power_trace"); lua_gettable(L, -2); - host.power_trace = tmgr_trace_new(lua_tostring(L, -1)); - lua_pop(L, 1); - - lua_pushstring(L, "core"); - lua_gettable(L, -2); - host.core_amount = lua_tonumber(L, -1); - if (host.core_amount == 0) - host.core_amount = 1; + host.power_trace = tmgr_trace_new_from_file(lua_tostring(L, -1)); lua_pop(L, 1); //get state initial lua_pushstring(L, "state_initial"); lua_gettable(L, -2); - state = lua_tonumber(L, -1); + if(!lua_isnumber(L,-1)) state = 1;// Default value + else state = lua_tonumber(L, -1); lua_pop(L, 1); + if (state) host.initial_state = SURF_RESOURCE_ON; else @@ -120,7 +133,7 @@ int console_add_host(lua_State *L) { //get trace state lua_pushstring(L, "state_trace"); lua_gettable(L, -2); - host.state_trace = tmgr_trace_new(lua_tostring(L, -1)); + host.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1)); lua_pop(L, 1); sg_platf_new_host(&host); @@ -162,25 +175,25 @@ int console_add_link(lua_State *L) { //get bandwidth_trace value lua_pushstring(L, "bandwidth_trace"); lua_gettable(L, -2); - link.bandwidth_trace = tmgr_trace_new(lua_tostring(L, -1)); + link.bandwidth_trace = tmgr_trace_new_from_file(lua_tostring(L, -1)); lua_pop(L, 1); //get latency_trace value lua_pushstring(L, "latency_trace"); lua_gettable(L, -2); - link.latency_trace = tmgr_trace_new(lua_tostring(L, -1)); + link.latency_trace = tmgr_trace_new_from_file(lua_tostring(L, -1)); lua_pop(L, 1); //get state_trace value lua_pushstring(L, "state_trace"); lua_gettable(L, -2); - link.state_trace = tmgr_trace_new(lua_tostring(L, -1)); + link.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1)); lua_pop(L, 1); //get state_initial value lua_pushstring(L, "state_initial"); lua_gettable(L, -2); - if (lua_tonumber(L, -1)) + if (!lua_isnumber(L,-1) || lua_tonumber(L, -1)) link.state = SURF_RESOURCE_ON; else link.state = SURF_RESOURCE_OFF; @@ -233,18 +246,13 @@ int console_add_router(lua_State* L) { #include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ int console_add_route(lua_State *L) { - static int AX_ptr = 0; - static int surfxml_bufferstack_size = 2048; + s_sg_platf_route_cbarg_t route; + memset(&route,0,sizeof(route)); /* allocating memory for the buffer, I think 2kB should be enough */ surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); - const char*src; - const char*dst; int is_symmetrical; - xbt_dynar_t links; - unsigned int cursor; - char *link_id; if (! lua_istable(L, -1)) { XBT_ERROR("Bad Arguments to create a route, Should be a table with named arguments"); @@ -253,19 +261,19 @@ int console_add_route(lua_State *L) { lua_pushstring(L,"src"); lua_gettable(L,-2); - src = lua_tostring(L, -1); + route.src = lua_tostring(L, -1); lua_pop(L,1); lua_pushstring(L,"dest"); lua_gettable(L,-2); - dst = lua_tostring(L, -1); + route.dst = lua_tostring(L, -1); lua_pop(L,1); lua_pushstring(L,"links"); lua_gettable(L,-2); - links = xbt_str_split(lua_tostring(L, -1), ", \t\r\n"); - if (xbt_dynar_is_empty(links)) - xbt_dynar_push_as(links,char*,xbt_strdup(lua_tostring(L, -1))); + route.link_list = xbt_str_split(lua_tostring(L, -1), ", \t\r\n"); + if (xbt_dynar_is_empty(route.link_list)) + xbt_dynar_push_as(route.link_list,char*,xbt_strdup(lua_tostring(L, -1))); lua_pop(L,1); lua_pushstring(L,"symmetrical"); @@ -273,28 +281,19 @@ int console_add_route(lua_State *L) { is_symmetrical = lua_tointeger(L, -1); lua_pop(L,1); + route.gw_src = NULL; + route.gw_dst = NULL; + /* We are relying on the XML bypassing mechanism since the corresponding sg_platf does not exist yet. * Et ouais mon pote. That's the way it goes. F34R. */ - SURFXML_BUFFER_SET(route_src, src); - SURFXML_BUFFER_SET(route_dst, dst); if (is_symmetrical) - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES; + route.symmetrical = TRUE; else - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; - SURFXML_START_TAG(route); - - xbt_dynar_foreach(links,cursor,link_id) { - SURFXML_BUFFER_SET(link_ctn_id, link_id); - A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; - SURFXML_START_TAG(link_ctn); - SURFXML_END_TAG(link_ctn); - } - SURFXML_END_TAG(route); - - xbt_dynar_free(&links); - free(surfxml_bufferstack); + route.symmetrical = FALSE; + sg_platf_new_route(&route); + return 0; } @@ -317,7 +316,21 @@ int console_AS_open(lua_State *L) { mode = lua_tostring(L, -1); lua_pop(L, 1); - sg_platf_new_AS_begin(id,mode); + int mode_int = A_surfxml_AS_routing_None; + if(!strcmp(mode,"Full")) mode_int = A_surfxml_AS_routing_Full; + else if(!strcmp(mode,"Floyd")) mode_int = A_surfxml_AS_routing_Floyd; + else if(!strcmp(mode,"Dijkstra")) mode_int = A_surfxml_AS_routing_Dijkstra; + else if(!strcmp(mode,"DijkstraCache")) mode_int = A_surfxml_AS_routing_DijkstraCache; + else if(!strcmp(mode,"RuleBased")) mode_int = A_surfxml_AS_routing_RuleBased; + else if(!strcmp(mode,"Vivaldi")) mode_int = A_surfxml_AS_routing_Vivaldi; + else if(!strcmp(mode,"Cluster")) mode_int = A_surfxml_AS_routing_Cluster; + else if(!strcmp(mode,"none")) mode_int = A_surfxml_AS_routing_None; + else xbt_die("Don't have the model name '%s'",mode); + + s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; + AS.id = id; + AS.routing = mode_int; + sg_platf_new_AS_begin(&AS); return 0; } @@ -356,7 +369,7 @@ int console_set_function(lua_State *L) { lua_pop(L, 1); // FIXME: hackish to go under MSG that way - m_host_t host = xbt_lib_get_or_null(host_lib,host_id,MSG_HOST_LEVEL); + msg_host_t host = xbt_lib_get_or_null(host_lib,host_id,MSG_HOST_LEVEL); if (!host) { XBT_ERROR("no host '%s' found",host_id); return -1; @@ -395,7 +408,7 @@ int console_host_set_property(lua_State *L) { lua_pop(L, 1); // FIXME: hackish to go under MSG that way - m_host_t host = xbt_lib_get_or_null(host_lib,name,MSG_HOST_LEVEL); + msg_host_t host = xbt_lib_get_or_null(host_lib,name,MSG_HOST_LEVEL); if (!host) { XBT_ERROR("no host '%s' found",name); return -1;