X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be93ba4a01d7fe3e5a75c4f622fd384e4f7b90a5..1d17c885aa26ea6c36c1fc0c6ab39ddd5d509755:/src/bindings/lua/lua_platf.cpp diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 8e022176ce..a52a7070d8 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -1,22 +1,20 @@ -/* 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. */ /* SimGrid Lua bindings */ -#include "lua_private.h" -#include "src/kernel/routing/NetPoint.hpp" +#include "lua_private.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.h" +#include "src/surf/surf_private.hpp" #include #include #include @@ -47,12 +45,24 @@ 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(); - return 0; } @@ -63,7 +73,7 @@ int console_close(lua_State *L) { } int console_add_backbone(lua_State *L) { - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.properties = nullptr; @@ -90,29 +100,22 @@ 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.c_str())); + routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(link.id)); 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 +137,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 @@ -201,7 +203,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; @@ -268,13 +270,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); @@ -284,8 +280,7 @@ int console_add_link(lua_State *L) { * add Router to AS components */ int console_add_router(lua_State* L) { - 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"); int type = lua_gettable(L, -2); @@ -305,8 +300,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"); @@ -331,19 +325,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 name : names) { + for (auto const& name : names) { if (name.length() > 0) { - simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name.c_str()); - route.link_list->push_back(link); + simgrid::kernel::resource::LinkImpl* link = simgrid::kernel::resource::LinkImpl::byName(name); + route.link_list.push_back(link); } } } @@ -373,14 +366,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); @@ -412,19 +403,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 name : names) { + for (auto const& name : names) { if (name.length() > 0) { - simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name.c_str()); - ASroute.link_list->push_back(link); + simgrid::kernel::resource::LinkImpl* link = simgrid::kernel::resource::LinkImpl::byName(name); + ASroute.link_list.push_back(link); } } } @@ -445,7 +435,6 @@ int console_add_ASroute(lua_State *L) { lua_pop(L,1); sg_platf_new_route(&ASroute); - delete ASroute.link_list; return 0; } @@ -483,10 +472,10 @@ 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); - s_sg_platf_AS_cbarg_t AS; + simgrid::kernel::routing::ZoneCreationArgs AS; AS.id = id; AS.routing = mode_int; - simgrid::s4u::NetZone* 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); @@ -501,7 +490,7 @@ 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; }