X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a5c5765ba9e8336b55101d248a8f43fbf9cd0c0c..16ad73e3b3cc887ff53b1c7bb9ccee90d4d50ef3:/src/bindings/lua/lua_platf.cpp diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 8e8bffabf9..dac0399226 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -1,24 +1,26 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ /* SimGrid Lua bindings */ -#include "lua_private.h" -#include "src/surf/xml/platf_private.hpp" +#include "lua_private.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include "surf/surf_routing.h" -#include -#include +#include "src/surf/xml/platf_private.hpp" +#include +#include -extern "C" { #include -} -#include -#include "src/surf/surf_private.h" +#include "src/surf/surf_private.hpp" +#include +#include +#include +#include +#include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)"); @@ -44,33 +46,42 @@ static const luaL_Reg platf_functions[] = { {nullptr, nullptr} }; +static simgrid::s4u::Link::SharingPolicy link_policy_get_by_name(const char* policy) +{ + if (policy && not strcmp(policy, "FULLDUPLEX")) { + XBT_WARN("Please update your platform to use SPLITDUPLEX instead of FULLDUPLEX"); + return simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; + } else if (policy && not strcmp(policy, "SPLITDUPLEX")) { + return simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; + } else if (policy && not strcmp(policy, "FATPIPE")) { + return simgrid::s4u::Link::SharingPolicy::FATPIPE; + } else { + return simgrid::s4u::Link::SharingPolicy::SHARED; + } +} + int console_open(lua_State *L) { sg_platf_init(); - sg_platf_begin(); - - storage_register_callbacks(); - routing_register_callbacks(); + simgrid::s4u::on_platform_creation(); return 0; } int console_close(lua_State *L) { - sg_platf_end(); + simgrid::s4u::on_platform_created(); sg_platf_exit(); return 0; } int console_add_backbone(lua_State *L) { - s_sg_platf_link_cbarg_t link; - memset(&link,0,sizeof(link)); - int type; + simgrid::kernel::routing::LinkCreationArgs link; link.properties = nullptr; lua_ensure(lua_istable(L, -1),"Bad Arguments to create backbone in Lua. Should be a table with named arguments."); lua_pushstring(L, "id"); - type = lua_gettable(L, -2); + int type = lua_gettable(L, -2); lua_ensure(type == LUA_TSTRING, "Attribute 'id' must be specified for backbone and must be a string."); link.id = lua_tostring(L, -1); lua_pop(L, 1); @@ -79,40 +90,33 @@ int console_add_backbone(lua_State *L) { type = lua_gettable(L, -2); lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, "Attribute 'bandwidth' must be specified for backbone and must either be a string (in the right format; see docs) or a number."); - link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1),"bandwidth of backbone",link.id); + link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of backbone", link.id.c_str()); lua_pop(L, 1); lua_pushstring(L, "lat"); type = lua_gettable(L, -2); lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, "Attribute 'lat' must be specified for backbone and must either be a string (in the right format; see docs) or a number."); - link.latency = surf_parse_get_time(lua_tostring(L, -1),"latency of backbone",link.id); + link.latency = surf_parse_get_time(lua_tostring(L, -1), "latency of backbone", link.id.c_str()); lua_pop(L, 1); lua_pushstring(L, "sharing_policy"); - type = lua_gettable(L, -2); + lua_gettable(L, -2); const char* policy = lua_tostring(L, -1); - if (policy && !strcmp(policy,"FULLDUPLEX")) { - link.policy = SURF_LINK_FULLDUPLEX; - } else if (policy && !strcmp(policy,"FATPIPE")) { - link.policy = SURF_LINK_FATPIPE; - } else { - link.policy = SURF_LINK_SHARED; - } + lua_pop(L, 1); + link.policy = link_policy_get_by_name(policy); sg_platf_new_link(&link); - routing_cluster_add_backbone(sg_link_by_name(link.id)); + routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl()); return 0; } int console_add_host___link(lua_State *L) { - s_sg_platf_host_link_cbarg_t hostlink; - memset(&hostlink,0,sizeof(hostlink)); + simgrid::kernel::routing::HostLinkCreationArgs hostlink; int type; - lua_ensure(lua_istable(L, -1), - "Bad Arguments to create host_link in Lua. Should be a table with named arguments."); + lua_ensure(lua_istable(L, -1), "Bad Arguments to create host_link in Lua. Should be a table with named arguments."); lua_pushstring(L, "id"); type = lua_gettable(L, -2); @@ -134,15 +138,14 @@ int console_add_host___link(lua_State *L) { hostlink.link_down = lua_tostring(L, -1); lua_pop(L, 1); - XBT_DEBUG("Create a host_link for host %s", hostlink.id); + XBT_DEBUG("Create a host_link for host %s", hostlink.id.c_str()); sg_platf_new_hostlink(&hostlink); return 0; } int console_add_host(lua_State *L) { - s_sg_platf_host_cbarg_t host; - memset(&host,0,sizeof(host)); + simgrid::kernel::routing::HostCreationArgs host; int type; // we get values from the table passed as argument @@ -162,18 +165,17 @@ int console_add_host(lua_State *L) { type = lua_gettable(L, -2); lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, "Attribute 'speed' must be specified for host and must either be a string (in the correct format; check documentation) or a number."); - host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); if (type == LUA_TNUMBER) - xbt_dynar_push_as(host.speed_per_pstate, double, lua_tointeger(L, -1)); + host.speed_per_pstate.push_back(lua_tointeger(L, -1)); else // LUA_TSTRING - xbt_dynar_push_as(host.speed_per_pstate, double, surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id)); + host.speed_per_pstate.push_back(surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id)); 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 + if (not lua_isnumber(L, -1)) + host.core_amount = 1; // Default value else host.core_amount = lua_tonumber(L, -1); if (host.core_amount == 0) @@ -197,23 +199,20 @@ int console_add_host(lua_State *L) { lua_pop(L, 1); sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_per_pstate); return 0; } int console_add_link(lua_State *L) { - s_sg_platf_link_cbarg_t link; - memset(&link,0,sizeof(link)); + simgrid::kernel::routing::LinkCreationArgs link; - int type; const char* policy; lua_ensure(lua_istable(L, -1), "Bad Arguments to create link, Should be a table with named arguments"); // get Id Value lua_pushstring(L, "id"); - type = lua_gettable(L, -2); + int type = lua_gettable(L, -2); lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, "Attribute 'id' must be specified for any link and must be a string."); link.id = lua_tostring(L, -1); @@ -227,7 +226,7 @@ int console_add_link(lua_State *L) { if (type == LUA_TNUMBER) link.bandwidth = lua_tonumber(L, -1); else // LUA_TSTRING - link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1),"bandwidth of link", link.id); + link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of link", link.id.c_str()); lua_pop(L, 1); //get latency value @@ -238,7 +237,7 @@ int console_add_link(lua_State *L) { if (type == LUA_TNUMBER) link.latency = lua_tonumber(L, -1); else // LUA_TSTRING - link.latency = surf_parse_get_time(lua_tostring(L, -1),"latency of link", link.id); + link.latency = surf_parse_get_time(lua_tostring(L, -1), "latency of link", link.id.c_str()); lua_pop(L, 1); /*Optional Arguments */ @@ -272,13 +271,7 @@ int console_add_link(lua_State *L) { lua_gettable(L, -2); policy = lua_tostring(L, -1); lua_pop(L, 1); - if (policy && !strcmp(policy,"FULLDUPLEX")) { - link.policy = SURF_LINK_FULLDUPLEX; - } else if (policy && !strcmp(policy,"FATPIPE")) { - link.policy = SURF_LINK_FATPIPE; - } else { - link.policy = SURF_LINK_SHARED; - } + link.policy = link_policy_get_by_name(policy); sg_platf_new_link(&link); @@ -288,45 +281,36 @@ int console_add_link(lua_State *L) { * add Router to AS components */ int console_add_router(lua_State* L) { - s_sg_platf_router_cbarg_t router; - memset(&router,0,sizeof(router)); - int type; - - lua_ensure(lua_istable(L, -1), - "Bad Arguments to create router, Should be a table with named arguments"); + lua_ensure(lua_istable(L, -1), "Bad Arguments to create router, Should be a table with named arguments"); lua_pushstring(L, "id"); - type = lua_gettable(L, -2); + int type = lua_gettable(L, -2); lua_ensure(type == LUA_TSTRING, "Attribute 'id' must be specified for any link and must be a string."); - router.id = lua_tostring(L, -1); + const char* name = lua_tostring(L, -1); lua_pop(L,1); lua_pushstring(L,"coord"); lua_gettable(L,-2); - router.coord = lua_tostring(L, -1); + const char* coords = lua_tostring(L, -1); lua_pop(L,1); - sg_platf_new_router(&router); + sg_platf_new_router(name, coords); return 0; } int console_add_route(lua_State *L) { XBT_DEBUG("Adding route"); - s_sg_platf_route_cbarg_t route; - memset(&route,0,sizeof(route)); + simgrid::kernel::routing::RouteCreationArgs route; int type; - /* allocating memory for the buffer, I think 2kB should be enough */ - surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); - lua_ensure(lua_istable(L, -1), "Bad Arguments to add a route. Should be a table with named arguments"); lua_pushstring(L,"src"); type = lua_gettable(L,-2); lua_ensure(type == LUA_TSTRING, "Attribute 'src' must be specified for any route and must be a string."); const char *srcName = lua_tostring(L, -1); - route.src = sg_netcard_by_name_or_null(srcName); + route.src = sg_netpoint_by_name_or_null(srcName); lua_ensure(route.src != nullptr, "Attribute 'src=%s' of route does not name a node.", srcName); lua_pop(L,1); @@ -334,7 +318,7 @@ int console_add_route(lua_State *L) { type = lua_gettable(L,-2); lua_ensure(type == LUA_TSTRING, "Attribute 'dest' must be specified for any route and must be a string."); const char *dstName = lua_tostring(L, -1); - route.dst = sg_netcard_by_name_or_null(dstName); + route.dst = sg_netpoint_by_name_or_null(dstName); lua_ensure(route.dst != nullptr, "Attribute 'dst=%s' of route does not name a node.", dstName); lua_pop(L,1); @@ -342,19 +326,18 @@ int console_add_route(lua_State *L) { type = lua_gettable(L,-2); lua_ensure(type == LUA_TSTRING, "Attribute 'links' must be specified for any route and must be a string (different links separated by commas or single spaces."); - route.link_list = new std::vector(); - xbt_dynar_t names = xbt_str_split(lua_tostring(L, -1), ", \t\r\n"); - if (xbt_dynar_is_empty(names)) { + std::vector names; + const char* str = lua_tostring(L, -1); + boost::split(names, str, boost::is_any_of(", \t\r\n")); + if (names.empty()) { /* unique name */ - route.link_list->push_back(Link::byName(lua_tostring(L, -1))); + route.link_list.push_back(simgrid::s4u::Link::by_name(lua_tostring(L, -1))->get_impl()); } else { // Several names separated by , \t\r\n - unsigned int cpt; - char *name; - xbt_dynar_foreach(names, cpt, name) { - if (strlen(name)>0) { - Link *link = Link::byName(name); - route.link_list->push_back(link); + for (auto const& name : names) { + if (name.length() > 0) { + simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl(); + route.link_list.push_back(link); } } } @@ -389,52 +372,50 @@ int console_add_route(lua_State *L) { } int console_add_ASroute(lua_State *L) { - s_sg_platf_route_cbarg_t ASroute; - memset(&ASroute,0,sizeof(ASroute)); + simgrid::kernel::routing::RouteCreationArgs ASroute; lua_pushstring(L, "src"); lua_gettable(L, -2); const char *srcName = lua_tostring(L, -1); - ASroute.src = sg_netcard_by_name_or_null(srcName); + ASroute.src = sg_netpoint_by_name_or_null(srcName); lua_ensure(ASroute.src != nullptr, "Attribute 'src=%s' of AS route does not name a node.", srcName); lua_pop(L, 1); lua_pushstring(L, "dst"); lua_gettable(L, -2); const char *dstName = lua_tostring(L, -1); - ASroute.dst = sg_netcard_by_name_or_null(dstName); + ASroute.dst = sg_netpoint_by_name_or_null(dstName); lua_ensure(ASroute.dst != nullptr, "Attribute 'dst=%s' of AS route does not name a node.", dstName); lua_pop(L, 1); lua_pushstring(L, "gw_src"); lua_gettable(L, -2); const char *name = lua_tostring(L, -1); - ASroute.gw_src = sg_netcard_by_name_or_null(name); + ASroute.gw_src = sg_netpoint_by_name_or_null(name); lua_ensure(ASroute.gw_src, "Attribute 'gw_src=%s' of AS route does not name a valid node", name); lua_pop(L, 1); lua_pushstring(L, "gw_dst"); lua_gettable(L, -2); name = lua_tostring(L, -1); - ASroute.gw_dst = sg_netcard_by_name_or_null(name); + ASroute.gw_dst = sg_netpoint_by_name_or_null(name); lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst=%s' of AS route does not name a valid node", name); lua_pop(L, 1); lua_pushstring(L,"links"); lua_gettable(L,-2); - ASroute.link_list = new std::vector(); - xbt_dynar_t names = xbt_str_split(lua_tostring(L, -1), ", \t\r\n"); - if (xbt_dynar_is_empty(names)) { + std::vector names; + const char* str = lua_tostring(L, -1); + boost::split(names, str, boost::is_any_of(", \t\r\n")); + if (names.empty()) { /* unique name with no comma */ - ASroute.link_list->push_back(Link::byName(lua_tostring(L, -1))); + ASroute.link_list.push_back(simgrid::s4u::Link::by_name(lua_tostring(L, -1))->get_impl()); } else { // Several names separated by , \t\r\n - unsigned int cpt; - char *name; - xbt_dynar_foreach(names, cpt, name) { - if (strlen(name)>0) { - Link *link = Link::byName(name); - ASroute.link_list->push_back(link); + for (auto const& name : names) { + if (name.length() > 0) { + simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl(); + ASroute.link_list.push_back(link); } } } @@ -460,43 +441,47 @@ int console_add_ASroute(lua_State *L) { } int console_AS_open(lua_State *L) { - const char *id; - const char *mode; - int type; - XBT_DEBUG("Opening AS"); lua_ensure(lua_istable(L, 1), "Bad Arguments to AS_open, Should be a table with named arguments"); lua_pushstring(L, "id"); - type = lua_gettable(L, -2); + int type = lua_gettable(L, -2); lua_ensure(type == LUA_TSTRING, "Attribute 'id' must be specified for any AS and must be a string."); - id = lua_tostring(L, -1); + const char* id = lua_tostring(L, -1); lua_pop(L, 1); lua_pushstring(L, "mode"); lua_gettable(L, -2); - mode = lua_tostring(L, -1); + const char* mode = lua_tostring(L, -1); lua_pop(L, 1); 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,"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; + if (not strcmp(mode, "Full")) + mode_int = A_surfxml_AS_routing_Full; + else if (not strcmp(mode, "Floyd")) + mode_int = A_surfxml_AS_routing_Floyd; + else if (not strcmp(mode, "Dijkstra")) + mode_int = A_surfxml_AS_routing_Dijkstra; + else if (not strcmp(mode, "DijkstraCache")) + mode_int = A_surfxml_AS_routing_DijkstraCache; + else if (not strcmp(mode, "Vivaldi")) + mode_int = A_surfxml_AS_routing_Vivaldi; + else if (not strcmp(mode, "Cluster")) + mode_int = A_surfxml_AS_routing_Cluster; + else if (not 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; + simgrid::kernel::routing::ZoneCreationArgs AS; AS.id = id; AS.routing = mode_int; - simgrid::s4u::As *new_as = sg_platf_new_AS_begin(&AS); + simgrid::s4u::NetZone* new_as = sg_platf_new_Zone_begin(&AS); /* Build a Lua representation of the new AS on the stack */ lua_newtable(L); - simgrid::s4u::As **lua_as = (simgrid::s4u::As **) lua_newuserdata(L, sizeof(simgrid::s4u::As *)); /* table userdatum */ + simgrid::s4u::NetZone** lua_as = + (simgrid::s4u::NetZone**)lua_newuserdata(L, sizeof(simgrid::s4u::NetZone*)); /* table userdatum */ *lua_as = new_as; luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */ lua_setmetatable(L, -2); /* table userdatum */ @@ -506,37 +491,33 @@ int console_AS_open(lua_State *L) { } int console_AS_seal(lua_State *L) { XBT_DEBUG("Sealing AS"); - sg_platf_new_AS_seal(); + sg_platf_new_Zone_seal(); return 0; } int console_host_set_property(lua_State *L) { - const char* name =""; - const char* prop_id = ""; - const char* prop_value = ""; lua_ensure(lua_istable(L, -1), "Bad Arguments to create link, Should be a table with named arguments"); // get Host id lua_pushstring(L, "host"); lua_gettable(L, -2); - name = lua_tostring(L, -1); + const char* name = lua_tostring(L, -1); lua_pop(L, 1); // get prop Name lua_pushstring(L, "prop"); lua_gettable(L, -2); - prop_id = lua_tostring(L, -1); + const char* prop_id = lua_tostring(L, -1); lua_pop(L, 1); //get args lua_pushstring(L,"value"); lua_gettable(L, -2); - prop_value = lua_tostring(L,-1); + const char* prop_value = lua_tostring(L, -1); lua_pop(L, 1); sg_host_t host = sg_host_by_name(name); lua_ensure(host, "no host '%s' found",name); - xbt_dict_t props = sg_host_get_properties(host); - xbt_dict_set(props,prop_id,xbt_strdup(prop_value),nullptr); + host->set_property(prop_id, prop_value); return 0; }