/* 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 "xbt/log.h"
+#include <xbt/log.h>
+
+#include <simgrid/s4u/host.hpp>
+#include <simgrid/s4u/As.hpp>
-#include "simgrid/s4u/As.hpp"
#include "src/surf/surf_routing.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
}
As::~As()
{
- xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
char *key;
AS_t elem;
xbt_dict_foreach(children_, cursor, key, elem) {
xbt_dynar_t As::hosts()
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), NULL);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
for (unsigned int index = 0; index < xbt_dynar_length(vertices_); index++) {
- simgrid::surf::NetCard *card = xbt_dynar_get_as(vertices_, index, simgrid::surf::NetCard*);
+ simgrid::routing::NetCard *card = xbt_dynar_get_as(vertices_, index, simgrid::routing::NetCard*);
simgrid::s4u::Host *host = simgrid::s4u::Host::by_name_or_null(card->name());
- if (host!=NULL)
+ if (host!=nullptr)
xbt_dynar_push(res, &host);
}
return res;
}
- int As::addComponent(surf::NetCard *elm) {
- xbt_dynar_push_as(vertices_, surf::NetCard*, elm);
+ int As::addComponent(routing::NetCard *elm) {
+ xbt_dynar_push_as(vertices_, routing::NetCard*, elm);
return xbt_dynar_length(vertices_)-1;
}
}
void As::addBypassRoute(sg_platf_route_cbarg_t e_route){
- const char *src = e_route->src;
- const char *dst = e_route->dst;
-
/* Argument validity checks */
if (e_route->gw_dst) {
XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s",
- src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+ e_route->src->name(), e_route->gw_src->name(),
+ e_route->dst->name(), e_route->gw_dst->name());
xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
- src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
- xbt_assert(bypassRoutes_.find({src,dst}) == bypassRoutes_.end(), "The bypass route between %s@%s and %s@%s already exists.",
- src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+ e_route->src->name(), e_route->gw_src->name(),
+ e_route->dst->name(), e_route->gw_dst->name());
+ xbt_assert(bypassRoutes_.find({e_route->src->name(),e_route->dst->name()}) == bypassRoutes_.end(),
+ "The bypass route between %s@%s and %s@%s already exists.",
+ e_route->src->name(), e_route->gw_src->name(), e_route->dst->name(), e_route->gw_dst->name());
} else {
- XBT_DEBUG("Load bypassRoute from %s to %s", src, dst);
- xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.", src, dst);
- xbt_assert(bypassRoutes_.find({src,dst}) == bypassRoutes_.end(), "The bypass route between %s and %s already exists.", src, dst);
+ XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->name(), e_route->dst->name());
+ xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.",
+ e_route->src->name(), e_route->dst->name());
+ xbt_assert(bypassRoutes_.find({e_route->src->name(),e_route->dst->name()}) == bypassRoutes_.end(),
+ "The bypass route between %s and %s already exists.",
+ e_route->src->name(), e_route->dst->name());
}
/* Build a copy that will be stored in the dict */
newRoute->push_back(link);
/* Store it */
- bypassRoutes_.insert({{src,dst}, newRoute});
+ bypassRoutes_.insert({{e_route->src->name(),e_route->dst->name()}, newRoute});
}
} }; // namespace simgrid::s4u