-/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2017. 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 "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
-#include <float.h>
+#include <cfloat>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
namespace routing {
void DijkstraZone::seal()
{
+ unsigned int cursor;
xbt_node_t node = nullptr;
- unsigned int cursor2, cursor;
/* Create the topology graph */
- if (!routeGraph_)
+ if (not routeGraph_)
routeGraph_ = xbt_graph_new_graph(1, nullptr);
- if (!graphNodeMap_)
+ if (not graphNodeMap_)
graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
/* Add the loopback if needed */
if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
xbt_dynar_foreach (xbt_graph_get_nodes(routeGraph_), cursor, node) {
- xbt_edge_t edge = nullptr;
bool found = false;
+ xbt_edge_t edge = nullptr;
+ unsigned int cursor2;
xbt_dynar_foreach (xbt_graph_node_get_outedges(node), cursor2, edge) {
if (xbt_graph_edge_get_target(edge) == node) {
found = true;
}
}
- if (!found) {
+ if (not found) {
sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- e_route->link_list = new std::vector<Link*>();
+ e_route->link_list = new std::vector<surf::LinkImpl*>();
e_route->link_list->push_back(surf_network_model->loopback_);
xbt_graph_new_edge(routeGraph_, node, node, e_route);
}
xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id)
{
- xbt_node_t node = nullptr;
- graph_node_data_t data = nullptr;
- graph_node_map_element_t elm = nullptr;
-
- data = xbt_new0(struct graph_node_data, 1);
+ graph_node_data_t data = xbt_new0(struct graph_node_data, 1);
data->id = id;
data->graph_id = graph_id;
- node = xbt_graph_new_node(routeGraph_, data);
- elm = xbt_new0(struct graph_node_map_element, 1);
+ xbt_node_t node = xbt_graph_new_node(routeGraph_, data);
+ graph_node_map_element_t elm = xbt_new0(struct graph_node_map_element, 1);
elm->node = node;
xbt_dict_set_ext(graphNodeMap_, (char*)(&id), sizeof(int), (xbt_dictelm_t)elm, nullptr);
for (auto link : *e_route->link_list) {
route->link_list->insert(route->link_list->begin(), link);
if (lat)
- *lat += static_cast<Link*>(link)->latency();
+ *lat += static_cast<surf::LinkImpl*>(link)->latency();
}
}
/* apply dijkstra using the indexes from the graph's node array */
while (xbt_heap_size(pqueue) > 0) {
- int* v_id = (int*)xbt_heap_pop(pqueue);
+ int* v_id = static_cast<int*>(xbt_heap_pop(pqueue));
xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
xbt_edge_t edge = nullptr;
unsigned int cursor;
}
/* compose route path with links */
- NetPoint *gw_src = nullptr, *gw_dst, *prev_gw_src, *first_gw = nullptr;
- NetPoint *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = nullptr;
+ NetPoint* gw_src = nullptr;
+ NetPoint* gw_dst;
+ NetPoint* first_gw = nullptr;
for (int v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
if (edge == nullptr)
THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name().c_str(), dst->name().c_str());
- prev_gw_src = gw_src;
-
sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)xbt_graph_edge_get_data(edge);
+
+ NetPoint* prev_gw_src = gw_src;
gw_src = e_route->gw_src;
gw_dst = e_route->gw_dst;
if (hierarchy_ == RoutingMode::recursive && v != dst_node_id &&
strcmp(gw_dst->name().c_str(), prev_gw_src->name().c_str())) {
- std::vector<Link*>* e_route_as_to_as = new std::vector<Link*>();
+ std::vector<surf::LinkImpl*> e_route_as_to_as;
- getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr);
+ NetPoint* gw_dst_net_elm = nullptr;
+ NetPoint* prev_gw_src_net_elm = nullptr;
+ getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, &e_route_as_to_as, nullptr);
auto pos = route->link_list->begin();
- for (auto link : *e_route_as_to_as) {
+ for (auto link : e_route_as_to_as) {
route->link_list->insert(pos, link);
if (lat)
*lat += link->latency();
for (auto link : *e_route->link_list) {
route->link_list->insert(route->link_list->begin(), link);
if (lat)
- *lat += static_cast<Link*>(link)->latency();
+ *lat += static_cast<surf::LinkImpl*>(link)->latency();
}
size++;
}
xbt_dict_set_ext(routeCache_, (char*)(&src_id), sizeof(int), (xbt_dictelm_t)elm, nullptr);
}
- if (!routeCache_)
+ if (not routeCache_)
xbt_free(pred_arr);
}
/* Creation routing model functions */
-DijkstraZone::DijkstraZone(NetZone* father, const char* name, bool cached) : RoutedZone(father, name)
+DijkstraZone::DijkstraZone(NetZone* father, std::string name, bool cached) : RoutedZone(father, name)
{
if (cached)
routeCache_ = xbt_dict_new_homogeneous(&route_cache_elem_free);
addRouteCheckParams(route);
/* Create the topology graph */
- if (!routeGraph_)
+ if (not routeGraph_)
routeGraph_ = xbt_graph_new_graph(1, nullptr);
- if (!graphNodeMap_)
+ if (not graphNodeMap_)
graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
/* we don't check whether the route already exist, because the algorithm may find another path through some other
// Symmetrical YES
if (route->symmetrical == true) {
- if (!route->gw_dst && !route->gw_src)
+ if (not route->gw_dst && not route->gw_src)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName);
else
XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, route->gw_dst->name().c_str(), srcName,
