-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-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. */
namespace simgrid {
namespace kernel {
namespace routing {
+
namespace vivaldi {
-simgrid::xbt::Extension<NetPoint, Coords> Coords::EXTENSION_ID;
+
+xbt::Extension<NetPoint, Coords> Coords::EXTENSION_ID;
Coords::Coords(NetPoint* netpoint, const std::string& coordStr)
{
netpoint->extension_set<Coords>(this);
XBT_DEBUG("Coords of %s %p: %s", netpoint->get_cname(), netpoint, coordStr.c_str());
}
-}; // namespace vivaldi
+} // namespace vivaldi
static inline double euclidean_dist_comp(int index, std::vector<double>* src, std::vector<double>* dst)
{
static std::vector<double>* netpoint_get_coords(NetPoint* np)
{
- simgrid::kernel::routing::vivaldi::Coords* coords = np->extension<simgrid::kernel::routing::vivaldi::Coords>();
+ auto* coords = np->extension<vivaldi::Coords>();
xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)",
(np->is_netzone() ? "Netzone" : (np->is_host() ? "Host" : "Router")), np->get_cname(), np);
return &coords->coords;
xbt_assert(netpoint->get_englobing_zone() == this,
"Cannot add a peer link to a netpoint that is not in this netzone");
- new simgrid::kernel::routing::vivaldi::Coords(netpoint, coord);
+ new vivaldi::Coords(netpoint, coord);
std::string link_up = "link_" + netpoint->get_name() + "_UP";
std::string link_down = "link_" + netpoint->get_name() + "_DOWN";
if (src->is_netzone()) {
std::string srcName = "router_" + src->get_name();
std::string dstName = "router_" + dst->get_name();
- route->gw_src = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(srcName);
- route->gw_dst = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(dstName);
+ route->gw_src = s4u::Engine::get_instance()->netpoint_by_name_or_null(srcName);
+ route->gw_dst = s4u::Engine::get_instance()->netpoint_by_name_or_null(dstName);
}
/* Retrieve the private links */
*lat += euclidean_dist / 1000.0; // From .ms to .s
}
}
-}
-}
-}
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid