X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7c6662f2627dddac82f15cb8d4f1b42ac23e2b9..477fc68ab3dd1b5210d7db49144d90d0d9e57993:/src/bindings/lua/lua_platf.cpp diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index a52a7070d8..9b47ad0593 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2020. 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. */ @@ -7,24 +7,28 @@ #include "lua_private.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 - -#include +#include "xbt/parse_units.hpp" -#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 */ @@ -59,21 +63,26 @@ static simgrid::s4u::Link::SharingPolicy link_policy_get_by_name(const char* pol } } -int console_open(lua_State *L) { +int console_open(lua_State*) +{ sg_platf_init(); - sg_platf_begin(); + 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) { simgrid::kernel::routing::LinkCreationArgs link; + lua_Debug ar; + lua_getstack(L, 1, &ar); + lua_getinfo(L, "Sl", &ar); link.properties = nullptr; @@ -89,14 +98,16 @@ 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(xbt_parse_get_bandwidth(ar.short_src, ar.currentline, 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.c_str()); + link.latency = + xbt_parse_get_time(ar.short_src, ar.currentline, lua_tostring(L, -1), "latency of backbone", link.id.c_str()); lua_pop(L, 1); lua_pushstring(L, "sharing_policy"); @@ -106,7 +117,7 @@ int console_add_backbone(lua_State *L) { link.policy = link_policy_get_by_name(policy); sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(link.id)); + routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl()); return 0; } @@ -146,6 +157,9 @@ int console_add_host___link(lua_State *L) { int console_add_host(lua_State *L) { simgrid::kernel::routing::HostCreationArgs host; int type; + lua_Debug ar; + lua_getstack(L, 1, &ar); + lua_getinfo(L, "Sl", &ar); // we get values from the table passed as argument lua_ensure(lua_istable(L, -1), @@ -167,7 +181,8 @@ int console_add_host(lua_State *L) { if (type == LUA_TNUMBER) host.speed_per_pstate.push_back(lua_tointeger(L, -1)); else // LUA_TSTRING - host.speed_per_pstate.push_back(surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id)); + host.speed_per_pstate.push_back( + xbt_parse_get_speed(ar.short_src, ar.currentline, lua_tostring(L, -1), "speed of host", host.id)); lua_pop(L, 1); // get core @@ -186,7 +201,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 @@ -194,7 +209,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); @@ -204,6 +219,9 @@ int console_add_host(lua_State *L) { int console_add_link(lua_State *L) { simgrid::kernel::routing::LinkCreationArgs link; + lua_Debug ar; + lua_getstack(L, 1, &ar); + lua_getinfo(L, "Sl", &ar); const char* policy; @@ -223,9 +241,10 @@ 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(xbt_parse_get_bandwidth(ar.short_src, ar.currentline, lua_tostring(L, -1), + "bandwidth of link", link.id.c_str())); lua_pop(L, 1); //get latency value @@ -236,7 +255,8 @@ 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.c_str()); + link.latency = + xbt_parse_get_time(ar.short_src, ar.currentline, lua_tostring(L, -1), "latency of link", link.id.c_str()); lua_pop(L, 1); /*Optional Arguments */ @@ -246,7 +266,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 @@ -254,7 +274,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 @@ -262,7 +282,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 @@ -330,12 +350,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::kernel::resource::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::kernel::resource::LinkImpl* link = simgrid::kernel::resource::LinkImpl::byName(name); + simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl(); route.link_list.push_back(link); } } @@ -389,16 +409,16 @@ 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"); @@ -408,12 +428,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::kernel::resource::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::kernel::resource::LinkImpl* link = simgrid::kernel::resource::LinkImpl::byName(name); + simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl(); ASroute.link_list.push_back(link); } } @@ -475,12 +495,12 @@ int console_AS_open(lua_State *L) { 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 */ @@ -488,7 +508,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; @@ -516,14 +538,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) {