X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df12bbc75c274351f3b3a628740e0b3270f08e18..d92bb5e90dbe8bd7eead32aba6941a4341fcf204:/src/bindings/lua/lua_platf.c diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c index a2ebe1130b..2cd35f4f89 100644 --- a/src/bindings/lua/lua_platf.c +++ b/src/bindings/lua/lua_platf.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010, 2012-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -41,9 +41,12 @@ static const luaL_reg platf_functions[] = { 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; } @@ -58,10 +61,12 @@ int console_close(lua_State *L) { /* Initialize MSG and WKS hosts */ XBT_DEBUG("Initialize MSG and WKS hosts"); xbt_lib_foreach(host_lib, cursor, name, data) { - if(data[SURF_WKS_LEVEL]){ + if(data[SURF_HOST_LEVEL]){ XBT_DEBUG("\tSee surf host %s",name); - SIMIX_host_create(name, data[SURF_WKS_LEVEL], NULL); - __MSG_host_create((smx_host_t)data[SIMIX_HOST_LEVEL]); + SIMIX_host_create(name); + // THIS IS BRAINDEAD. There is no sg_host_t in that level, but a smx_host_priv. So commenting out for now. + // Lua is broken anyway. Christian will fix it + // __MSG_host_create((sg_host_t)data[SIMIX_HOST_LEVEL]); } } @@ -89,7 +94,8 @@ int console_add_host(lua_State *L) { // get power value lua_pushstring(L, "power"); lua_gettable(L, -2); - host.power_peak = lua_tonumber(L, -1); + host.power_peak = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push_as(host.power_peak, double, lua_tonumber(L, -1)); lua_pop(L, 1); // get core @@ -104,7 +110,8 @@ int console_add_host(lua_State *L) { //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 @@ -188,7 +195,7 @@ int console_add_link(lua_State *L) { //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; @@ -241,18 +248,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"); @@ -261,19 +263,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"); @@ -281,28 +283,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; } @@ -330,13 +323,15 @@ int console_AS_open(lua_State *L) { 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); - sg_platf_new_AS_begin(id,mode_int); + 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; } @@ -371,7 +366,7 @@ int console_set_function(lua_State *L) { //get args lua_pushstring(L,"args"); lua_gettable(L, -2); - args = xbt_str_split_quoted( lua_tostring(L,-1) ); + args = xbt_str_split_str( lua_tostring(L,-1) , ","); lua_pop(L, 1); // FIXME: hackish to go under MSG that way @@ -381,6 +376,7 @@ int console_set_function(lua_State *L) { return -1; } + // FIXME: use sg_platf_new_process directly (warning: find a way to check hostname) MSG_set_function(host_id, function_id, args); return 0;