X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cb3bf3a6aefcc8ecb66bf66a14d8ea2efa749bc6..e3be783d9ed8c1a85f7460b57b4f1243ac87c948:/src/bindings/lua/lua_platf.cpp diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 6f45328304..26c9276499 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-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. */ @@ -6,15 +6,13 @@ /* 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 @@ -47,6 +45,20 @@ 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(); @@ -63,7 +75,7 @@ int console_close(lua_State *L) { } int console_add_backbone(lua_State *L) { - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.properties = nullptr; @@ -93,22 +105,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_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); - routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id)); + routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(link.id)); 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,8 +146,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 @@ -200,7 +205,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; @@ -267,13 +272,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); @@ -303,8 +302,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"); @@ -329,19 +327,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::kernel::resource::LinkImpl::byName(lua_tostring(L, -1))); } 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::kernel::resource::LinkImpl::byName(name); + route.link_list.push_back(link); } } } @@ -371,14 +368,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); @@ -410,19 +405,18 @@ int console_add_ASroute(lua_State *L) { 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::kernel::resource::LinkImpl::byName(lua_tostring(L, -1))); } 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::kernel::resource::LinkImpl::byName(name); + ASroute.link_list.push_back(link); } } } @@ -443,7 +437,6 @@ int console_add_ASroute(lua_State *L) { lua_pop(L,1); sg_platf_new_route(&ASroute); - delete ASroute.link_list; return 0; } @@ -481,7 +474,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);