}
namespace simgrid {
-namespace surf {
+namespace routing {
AsRoutedGraph::AsRoutedGraph(const char*name)
: AsImpl(name)
return ret;
ret = xbt_graph_new_node(graph, xbt_strdup(name));
- xbt_dict_set(nodes, name, ret, NULL);
+ xbt_dict_set(nodes, name, ret, nullptr);
return ret;
}
snprintf(name, len, "%s%s", sn, dn);
xbt_edge_t ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
- if (ret == NULL) {
+ if (ret == nullptr) {
snprintf(name, len, "%s%s", dn, sn);
ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
}
- if (ret == NULL) {
- ret = xbt_graph_new_edge(graph, s, d, NULL);
- xbt_dict_set(edges, name, ret, NULL);
+ if (ret == nullptr) {
+ ret = xbt_graph_new_edge(graph, s, d, nullptr);
+ xbt_dict_set(edges, name, ret, nullptr);
}
free(name);
return ret;
}
namespace simgrid {
-namespace surf {
+namespace routing {
xbt_dynar_t AsRoutedGraph::getOneLinkRoutes()
{
route->link_list->clear();
NetCard *src_elm = xbt_dynar_get_as(vertices_, src, NetCard*);
NetCard *dst_elm = xbt_dynar_get_as(vertices_, dst, NetCard*);
- this->getRouteAndLatency(src_elm, dst_elm,route, NULL);
+ this->getRouteAndLatency(src_elm, dst_elm,route, nullptr);
if (route->link_list->size() == 1) {
Link *link = route->link_list->at(0);
else if (hierarchy_ == RoutingMode::recursive)
onelink = new Onelink(link, route->gw_src, route->gw_dst);
else
- onelink = new Onelink(link, NULL, NULL);
+ onelink = new Onelink(link, nullptr, nullptr);
xbt_dynar_push(ret, &onelink);
}
}
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
route->link_list = new std::vector<Link*>();
- getRouteAndLatency(my_src, my_dst, route, NULL);
+ getRouteAndLatency(my_src, my_dst, route, nullptr);
XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->name(), my_dst->name());
"The hierarchy of this AS is neither BASIC nor RECURSIVE, I'm lost here.");
if (hierarchy == RoutingMode::recursive) {
- xbt_assert(routearg->gw_src && routearg->gw_dst, "NULL is obviously a deficient gateway");
+ xbt_assert(routearg->gw_src && routearg->gw_dst, "nullptr is obviously a deficient gateway");
result->gw_src = routearg->gw_src;
result->gw_dst = routearg->gw_dst;
void AsRoutedGraph::getRouteCheckParams(NetCard *src, NetCard *dst)
{
- xbt_assert(src,"Cannot find a route from NULL to %s", dst->name());
- xbt_assert(dst,"Cannot find a route from %s to NULL", src->name());
+ xbt_assert(src,"Cannot find a route from nullptr to %s", dst->name());
+ xbt_assert(dst,"Cannot find a route from %s to nullptr", src->name());
As *src_as = src->containingAS();
As *dst_as = dst->containingAS();
src->name(), dst->name(), src_as->name(), dst_as->name(), name());
}
void AsRoutedGraph::addRouteCheckParams(sg_platf_route_cbarg_t route) {
- const char *srcName = route->src;
- const char *dstName = route->dst;
- NetCard *src = sg_netcard_by_name_or_null(srcName);
- NetCard *dst = sg_netcard_by_name_or_null(dstName);
+ NetCard *src = route->src;
+ NetCard *dst = route->dst;
+ const char *srcName = src->name();
+ const char *dstName = dst->name();
if(!route->gw_dst && !route->gw_src) {
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName);