X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/895710d49f77179d9893bc76b3e31b69fae638af..3a15a2893fa0aa6b626063cb446cd1fc6b0088d8:/include/simgrid/kernel/routing/VivaldiZone.hpp diff --git a/include/simgrid/kernel/routing/VivaldiZone.hpp b/include/simgrid/kernel/routing/VivaldiZone.hpp index d1bc241494..d7627b96c5 100644 --- a/include/simgrid/kernel/routing/VivaldiZone.hpp +++ b/include/simgrid/kernel/routing/VivaldiZone.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. 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. */ @@ -29,7 +29,7 @@ namespace routing { * * The resulting value is assumed to be in milliseconds. * - * So, to go from an host A to an host B, the following links would be used: + * So, to go from a host A to a host B, the following links would be used: * private(A)_UP, private(B)_DOWN, with the additional latency computed above. * The bandwidth of the UP and DOWN links is not symmetric (in contrary to usual SimGrid * links), but naturally correspond to the values provided when the peer was created. @@ -46,26 +46,16 @@ namespace routing { class XBT_PRIVATE VivaldiZone : public ClusterZone { public: - explicit VivaldiZone(NetZone* father, std::string name); - - void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, std::string coord); + using ClusterZone::ClusterZone; + void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, const std::string& coord); void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override; - - // deprecated - XBT_ATTRIB_DEPRECATED_v323("Please use VivaldiZone::set_peer_link()") void setPeerLink(NetPoint* netpoint, - double bw_in, double bw_out, - std::string coord) - { - set_peer_link(netpoint, bw_in, bw_out, coord); - } }; namespace vivaldi { class XBT_PRIVATE Coords { public: - static simgrid::xbt::Extension EXTENSION_ID; - explicit Coords(NetPoint* host, std::string str); - virtual ~Coords() = default; + static xbt::Extension EXTENSION_ID; + explicit Coords(NetPoint* host, const std::string& str); std::vector coords; };