X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bf71617c94b4c2ff15ac076992a24a0fdbaa897..16ad73e3b3cc887ff53b1c7bb9ccee90d4d50ef3:/src/bindings/lua/lua_platf.cpp diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 47f46410a3..dac0399226 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -6,19 +6,18 @@ /* SimGrid Lua bindings */ #include "lua_private.hpp" -#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.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 @@ -47,23 +46,35 @@ 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(); + 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) { - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.properties = nullptr; @@ -93,22 +104,16 @@ int console_add_backbone(lua_State *L) { lua_gettable(L, -2); const char* policy = lua_tostring(L, -1); lua_pop(L, 1); - if (policy && not strcmp(policy, "FULLDUPLEX")) { - link.policy = SURF_LINK_SPLITDUPLEX; - } 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); - 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."); @@ -140,7 +145,7 @@ int console_add_host___link(lua_State *L) { } int console_add_host(lua_State *L) { - s_sg_platf_host_cbarg_t host; + simgrid::kernel::routing::HostCreationArgs host; int type; // we get values from the table passed as argument @@ -199,7 +204,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; @@ -266,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 && not strcmp(policy, "FULLDUPLEX")) { - link.policy = SURF_LINK_SPLITDUPLEX; - } 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,7 +301,7 @@ int console_add_router(lua_State* L) { int console_add_route(lua_State *L) { XBT_DEBUG("Adding route"); - RouteCreationArgs 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"); @@ -332,12 +331,12 @@ int console_add_route(lua_State *L) { 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); + simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl(); route.link_list.push_back(link); } } @@ -373,7 +372,7 @@ int console_add_route(lua_State *L) { } int console_add_ASroute(lua_State *L) { - RouteCreationArgs ASroute; + simgrid::kernel::routing::RouteCreationArgs ASroute; lua_pushstring(L, "src"); lua_gettable(L, -2); @@ -410,12 +409,12 @@ int console_add_ASroute(lua_State *L) { 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); + simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl(); ASroute.link_list.push_back(link); } } @@ -474,7 +473,7 @@ 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); @@ -518,7 +517,7 @@ 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; }