X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..c8f375f14b9e04a4dd1767cb70c70b6dfc173f9c:/src/bindings/lua/lua_platf.cpp diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 90c72c6490..2316b7b321 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2019. 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. */ @@ -6,27 +6,28 @@ /* SimGrid Lua bindings */ #include "lua_private.hpp" -#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/surf_private.hpp" #include "src/surf/xml/platf_private.hpp" -#include -#include -extern "C" { -#include -} - -#include "src/surf/surf_private.hpp" #include #include +#include #include + +#include +#include #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)"); +#include + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, lua, "Lua bindings (platform module)"); -#define PLATF_MODULE_NAME "simgrid.engine" -#define AS_FIELDNAME "__simgrid_as" +constexpr char PLATF_MODULE_NAME[] = "simgrid.engine"; +constexpr char AS_FIELDNAME[] = "__simgrid_as"; /* ********************************************************************************* */ /* simgrid.platf API */ @@ -47,23 +48,37 @@ static const luaL_Reg platf_functions[] = { {nullptr, nullptr} }; -int console_open(lua_State *L) { - sg_platf_init(); - sg_platf_begin(); +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; + } +} - storage_register_callbacks(); +int console_open(lua_State*) +{ + sg_platf_init(); + simgrid::s4u::Engine::on_platform_creation(); return 0; } -int console_close(lua_State *L) { - sg_platf_end(); +int console_close(lua_State*) +{ + simgrid::s4u::Engine::on_platform_created(); sg_platf_exit(); return 0; } int console_add_backbone(lua_State *L) { - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.properties = nullptr; @@ -79,7 +94,7 @@ 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.c_str()); + link.bandwidths.push_back(surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of backbone", link.id.c_str())); lua_pop(L, 1); lua_pushstring(L, "lat"); @@ -90,24 +105,19 @@ int console_add_backbone(lua_State *L) { 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 && not strcmp(policy, "FULLDUPLEX")) { - link.policy = SURF_LINK_FULLDUPLEX; - } else if (policy && not 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(simgrid::surf::LinkImpl::byName(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) { - HostLinkCreationArgs 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."); @@ -139,8 +149,7 @@ int console_add_host___link(lua_State *L) { } 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 @@ -182,7 +191,7 @@ int console_add_host(lua_State *L) { lua_gettable(L, -2); const char *filename = lua_tostring(L, -1); if (filename) - host.speed_trace = tmgr_trace_new_from_file(filename); + host.speed_trace = simgrid::kernel::profile::Profile::from_file(filename); lua_pop(L, 1); //get trace state @@ -190,7 +199,7 @@ int console_add_host(lua_State *L) { lua_gettable(L, -2); filename = lua_tostring(L, -1); if (filename) - host.state_trace = tmgr_trace_new_from_file(filename); + host.state_trace = simgrid::kernel::profile::Profile::from_file(filename); lua_pop(L, 1); sg_platf_new_host(&host); @@ -199,7 +208,7 @@ int console_add_host(lua_State *L) { } int console_add_link(lua_State *L) { - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; const char* policy; @@ -219,9 +228,9 @@ int console_add_link(lua_State *L) { lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, "Attribute 'bandwidth' must be specified for any link and must either be either a string (in the right format; see docs) or a number."); if (type == LUA_TNUMBER) - link.bandwidth = lua_tonumber(L, -1); + link.bandwidths.push_back(lua_tonumber(L, -1)); else // LUA_TSTRING - link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of link", link.id.c_str()); + link.bandwidths.push_back(surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of link", link.id.c_str())); lua_pop(L, 1); //get latency value @@ -242,7 +251,7 @@ int console_add_link(lua_State *L) { lua_gettable(L, -2); const char *filename = lua_tostring(L, -1); if (filename) - link.bandwidth_trace = tmgr_trace_new_from_file(filename); + link.bandwidth_trace = simgrid::kernel::profile::Profile::from_file(filename); lua_pop(L, 1); //get latency_trace value @@ -250,7 +259,7 @@ int console_add_link(lua_State *L) { lua_gettable(L, -2); filename = lua_tostring(L, -1); if (filename) - link.latency_trace = tmgr_trace_new_from_file(filename); + link.latency_trace = simgrid::kernel::profile::Profile::from_file(filename); lua_pop(L, 1); //get state_trace value @@ -258,7 +267,7 @@ int console_add_link(lua_State *L) { lua_gettable(L, -2); filename = lua_tostring(L, -1); if (filename) - link.state_trace = tmgr_trace_new_from_file(filename); + link.state_trace = simgrid::kernel::profile::Profile::from_file(filename); lua_pop(L, 1); //get policy value @@ -266,13 +275,7 @@ int console_add_link(lua_State *L) { lua_gettable(L, -2); policy = lua_tostring(L, -1); lua_pop(L, 1); - if (policy && not strcmp(policy, "FULLDUPLEX")) { - link.policy = SURF_LINK_FULLDUPLEX; - } else if (policy && not 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); @@ -302,8 +305,7 @@ int console_add_router(lua_State* L) { 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; lua_ensure(lua_istable(L, -1), "Bad Arguments to add a route. Should be a table with named arguments"); @@ -328,19 +330,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(); 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(simgrid::surf::LinkImpl::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 for (auto const& name : names) { if (name.length() > 0) { - simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name); - route.link_list->push_back(link); + simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl(); + route.link_list.push_back(link); } } } @@ -370,14 +371,12 @@ int console_add_route(lua_State *L) { route.gw_dst = nullptr; sg_platf_new_route(&route); - delete route.link_list; return 0; } 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); @@ -395,33 +394,32 @@ int console_add_ASroute(lua_State *L) { lua_pushstring(L, "gw_src"); lua_gettable(L, -2); - const char *name = lua_tostring(L, -1); - 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); + const char* pname = lua_tostring(L, -1); + ASroute.gw_src = sg_netpoint_by_name_or_null(pname); + lua_ensure(ASroute.gw_src, "Attribute 'gw_src=%s' of AS route does not name a valid node", pname); lua_pop(L, 1); lua_pushstring(L, "gw_dst"); lua_gettable(L, -2); - name = lua_tostring(L, -1); - 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); + pname = lua_tostring(L, -1); + ASroute.gw_dst = sg_netpoint_by_name_or_null(pname); + lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst=%s' of AS route does not name a valid node", pname); lua_pop(L, 1); lua_pushstring(L,"links"); lua_gettable(L,-2); - ASroute.link_list = new std::vector(); 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(simgrid::surf::LinkImpl::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 for (auto const& name : names) { if (name.length() > 0) { - simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name); - ASroute.link_list->push_back(link); + simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl(); + ASroute.link_list.push_back(link); } } } @@ -442,7 +440,6 @@ int console_add_ASroute(lua_State *L) { lua_pop(L,1); sg_platf_new_route(&ASroute); - delete ASroute.link_list; return 0; } @@ -480,15 +477,15 @@ int console_AS_open(lua_State *L) { mode_int = A_surfxml_AS_routing_None; else xbt_die("Don't have the model name '%s'",mode); - ZoneCreationArgs AS; + simgrid::kernel::routing::ZoneCreationArgs AS; AS.id = id; AS.routing = mode_int; - simgrid::s4u::NetZone* new_as = sg_platf_new_Zone_begin(&AS); + simgrid::kernel::routing::NetZoneImpl* new_as = sg_platf_new_Zone_begin(&AS); /* Build a Lua representation of the new AS on the stack */ lua_newtable(L); - simgrid::s4u::NetZone** lua_as = - (simgrid::s4u::NetZone**)lua_newuserdata(L, sizeof(simgrid::s4u::NetZone*)); /* table userdatum */ + simgrid::kernel::routing::NetZoneImpl** lua_as = (simgrid::kernel::routing::NetZoneImpl**)lua_newuserdata( + L, sizeof(simgrid::kernel::routing::NetZoneImpl*)); /* table userdatum */ *lua_as = new_as; luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */ lua_setmetatable(L, -2); /* table userdatum */ @@ -496,7 +493,9 @@ int console_AS_open(lua_State *L) { return 1; } -int console_AS_seal(lua_State *L) { + +int console_AS_seal(lua_State*) +{ XBT_DEBUG("Sealing AS"); sg_platf_new_Zone_seal(); return 0; @@ -524,14 +523,14 @@ int console_host_set_property(lua_State *L) { sg_host_t host = sg_host_by_name(name); lua_ensure(host, "no host '%s' found",name); - host->setProperty(prop_id, prop_value); + host->set_property(prop_id, prop_value); return 0; } /** - * \brief Registers the platform functions into the table simgrid.platf. - * \param L a lua state + * @brief Registers the platform functions into the table simgrid.platf. + * @param L a lua state */ void sglua_register_platf_functions(lua_State* L) {