X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/caec38ac39e3a61e7b68218e330c7dcf3f84afbc..e48ec1564fde37780b61d4156827cf0ce7cc2cfb:/src/s4u/s4u_Netzone.cpp diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index e118550cf0..415f8a94cf 100644 --- a/src/s4u/s4u_Netzone.cpp +++ b/src/s4u/s4u_Netzone.cpp @@ -1,23 +1,26 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2022. 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. */ #include "simgrid/Exception.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/NetZone.hpp" -#include "simgrid/simix.hpp" -#include "simgrid/zone.h" -#include "xbt/parse_units.hpp" +#include +#include +#include +#include +#include +#include + +#include "src/kernel/resource/LinkImpl.hpp" +#include "src/kernel/resource/StandardLinkImpl.hpp" namespace simgrid { namespace s4u { xbt::signal const& link_list)> + std::vector const& link_list)> NetZone::on_route_creation; xbt::signal NetZone::on_creation; xbt::signal NetZone::on_seal; @@ -47,7 +50,7 @@ std::vector NetZone::get_children() const return res; } -NetZone* NetZone::add_child(NetZone* new_zone) +NetZone* NetZone::add_child(NetZone* new_zone) // XBT_ATTRIB_DEPRECATED_v332 { new_zone->set_parent(this); return this; @@ -63,7 +66,7 @@ const char* NetZone::get_cname() const return pimpl_->get_cname(); } -NetZone* NetZone::get_father() +NetZone* NetZone::get_father() const // XBT_ATTRIB_DEPRECATED_v331 { return pimpl_->get_parent()->get_iface(); } @@ -94,38 +97,50 @@ int NetZone::get_host_count() const return pimpl_->get_host_count(); } -int NetZone::add_component(kernel::routing::NetPoint* elm) +unsigned long NetZone::add_component(kernel::routing::NetPoint* elm) { return pimpl_->add_component(elm); } -std::vector NetZone::get_link_list_impl(const std::vector link_list) +// XBT_ATTRIB_DEPRECATED_v332 +std::vector +NetZone::convert_to_linkInRoute(const std::vector& link_list) { - std::vector links; - for (const auto& link : link_list) { - links.push_back(link->get_impl()); + std::vector links; + for (const auto* link : link_list) { + links.emplace_back(LinkInRoute(link->get_iface())); } return links; } void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - const std::vector& link_list, bool symmetrical) + const std::vector& link_list, bool symmetrical) { - pimpl_->add_route(src, dst, gw_src, gw_dst, NetZone::get_link_list_impl(link_list), symmetrical); + pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical); } +// XBT_ATTRIB_DEPRECATED_v332 void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - const std::vector& link_list, bool symmetrical) + const std::vector& link_list, bool symmetrical) { - pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical); + pimpl_->add_route(src, dst, gw_src, gw_dst, convert_to_linkInRoute(link_list), symmetrical); } + +// XBT_ATTRIB_DEPRECATED_v332 void NetZone::add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - std::vector& link_list, bool symmetrical) + const std::vector& link_list, bool /*symmetrical*/) { - pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical); + pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, convert_to_linkInRoute(link_list)); +} + +void NetZone::add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, + kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, + const std::vector& link_list) +{ + pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list); } void NetZone::extract_xbt_graph(const s_xbt_graph_t* graph, std::map>* nodes, @@ -156,7 +171,7 @@ s4u::Host* NetZone::create_host(const std::string& name, const std::vector{speed}); } s4u::Host* NetZone::create_host(const std::string& name, const std::vector& speed_per_pstate) @@ -176,7 +191,25 @@ s4u::Link* NetZone::create_link(const std::string& name, const std::vector{bandwidth}); +} + +s4u::SplitDuplexLink* NetZone::create_split_duplex_link(const std::string& name, const std::string& bandwidth) +{ + double speed; + try { + speed = xbt_parse_get_bandwidth("", 0, bandwidth, ""); + } catch (const simgrid::ParseError&) { + throw std::invalid_argument(std::string("Impossible to create split-duplex link: ") + name + + std::string(". Invalid bandwidth: ") + bandwidth); + } + return create_split_duplex_link(name, speed); +} + +s4u::SplitDuplexLink* NetZone::create_split_duplex_link(const std::string& name, double bandwidth) +{ + return kernel::actor::simcall( + [this, &name, &bandwidth] { return pimpl_->create_split_duplex_link(name, std::vector{bandwidth}); }); } s4u::Link* NetZone::create_link(const std::string& name, const std::vector& bandwidths) @@ -185,7 +218,7 @@ s4u::Link* NetZone::create_link(const std::string& name, const std::vectorcreate_router(name); }); } +kernel::routing::NetPoint* NetZone::get_netpoint() +{ + return pimpl_->get_netpoint(); +} + +kernel::resource::NetworkModelIntf* NetZone::get_network_model() const +{ + kernel::resource::NetworkModelIntf* model = pimpl_->get_network_model().get(); + return model; +} } // namespace s4u } // namespace simgrid