-/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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. */
{
}
-static void graph_node_data_free(void* n)
+void DijkstraZone::route_graph_delete(xbt_graph_t g)
{
- delete static_cast<simgrid::kernel::routing::GraphNodeData*>(n);
-}
-
-static void graph_edge_data_free(void* e)
-{
- delete static_cast<simgrid::kernel::routing::RouteCreationArgs*>(e);
-}
-
-DijkstraZone::~DijkstraZone()
-{
- xbt_graph_free_graph(route_graph_, &graph_node_data_free, &graph_edge_data_free, nullptr);
+ xbt_graph_free_graph(g, [](void* n) { delete static_cast<simgrid::kernel::routing::GraphNodeData*>(n); },
+ [](void* e) { delete static_cast<simgrid::kernel::routing::RouteCreationArgs*>(e); }, nullptr);
}
void DijkstraZone::seal()
unsigned int cursor;
xbt_node_t node = nullptr;
- if (not route_graph_)
- route_graph_ = xbt_graph_new_graph(1, nullptr);
-
/* Add the loopback if needed */
if (network_model_->loopback_ && hierarchy_ == RoutingMode::base) {
-
- xbt_dynar_foreach (xbt_graph_get_nodes(route_graph_), cursor, node) {
+ xbt_dynar_foreach (xbt_graph_get_nodes(route_graph_.get()), cursor, node) {
bool found = false;
xbt_edge_t edge = nullptr;
unsigned int cursor2;
if (not found) {
RouteCreationArgs* route = new simgrid::kernel::routing::RouteCreationArgs();
route->link_list.push_back(network_model_->loopback_);
- xbt_graph_new_edge(route_graph_, node, node, route);
+ xbt_graph_new_edge(route_graph_.get(), node, node, route);
}
}
}
/* initialize graph indexes in nodes after graph has been built */
- xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_);
+ const_xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_.get());
xbt_dynar_foreach (nodes, cursor, node) {
GraphNodeData* data = static_cast<GraphNodeData*>(xbt_graph_node_get_data(node));
xbt_node_t DijkstraZone::route_graph_new_node(int id)
{
- xbt_node_t node = xbt_graph_new_node(route_graph_, new GraphNodeData(id));
+ xbt_node_t node = xbt_graph_new_node(route_graph_.get(), new GraphNodeData(id));
graph_node_map_.emplace(id, node);
return node;
int src_id = src->id();
int dst_id = dst->id();
- xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_);
+ const_xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_.get());
/* Use the graph_node id mapping set to quickly find the nodes */
- xbt_node_t src_elm = node_map_search(src_id);
- xbt_node_t dst_elm = node_map_search(dst_id);
+ const s_xbt_node_t* src_elm = node_map_search(src_id);
+ const s_xbt_node_t* dst_elm = node_map_search(dst_id);
int src_node_id = static_cast<GraphNodeData*>(xbt_graph_node_get_data(src_elm))->graph_id_;
int dst_node_id = static_cast<GraphNodeData*>(xbt_graph_node_get_data(dst_elm))->graph_id_;
/* if the src and dst are the same */
if (src_node_id == dst_node_id) {
-
- xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t);
- xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t);
- xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_s_v, node_e_v);
+ const s_xbt_node_t* node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t);
+ const s_xbt_node_t* node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t);
+ const s_xbt_edge_t* edge = xbt_graph_get_edge(route_graph_.get(), node_s_v, node_e_v);
if (edge == nullptr)
throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname()));
- RouteCreationArgs* e_route = static_cast<RouteCreationArgs*>(xbt_graph_edge_get_data(edge));
+ const RouteCreationArgs* e_route = static_cast<RouteCreationArgs*>(xbt_graph_edge_get_data(edge));
for (auto const& link : e_route->link_list) {
route->link_list.insert(route->link_list.begin(), link);
if (lat)
- *lat += static_cast<resource::LinkImpl*>(link)->get_latency();
+ *lat += link->get_latency();
}
}
while (not pqueue.empty()) {
int v_id = pqueue.top().second;
pqueue.pop();
- xbt_node_t v_node = xbt_dynar_get_as(nodes, v_id, xbt_node_t);
+ const s_xbt_node_t* v_node = xbt_dynar_get_as(nodes, v_id, xbt_node_t);
xbt_edge_t edge = nullptr;
unsigned int cursor;
xbt_dynar_foreach (xbt_graph_node_get_outedges(v_node), cursor, edge) {
- xbt_node_t u_node = xbt_graph_edge_get_target(edge);
- GraphNodeData* data = static_cast<GraphNodeData*>(xbt_graph_node_get_data(u_node));
+ const s_xbt_node_t* u_node = xbt_graph_edge_get_target(edge);
+ const GraphNodeData* data = static_cast<GraphNodeData*>(xbt_graph_node_get_data(u_node));
int u_id = data->graph_id_;
- RouteCreationArgs* tmp_e_route = static_cast<RouteCreationArgs*>(xbt_graph_edge_get_data(edge));
+ const RouteCreationArgs* tmp_e_route = static_cast<RouteCreationArgs*>(xbt_graph_edge_get_data(edge));
int cost_v_u = tmp_e_route->link_list.size(); /* count of links, old model assume 1 */
if (cost_v_u + cost_arr[v_id] < cost_arr[u_id]) {
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);
- xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t);
- xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_pred_v, node_v);
+ const s_xbt_node_t* node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
+ const s_xbt_node_t* node_v = xbt_dynar_get_as(nodes, v, xbt_node_t);
+ const s_xbt_edge_t* edge = xbt_graph_get_edge(route_graph_.get(), node_pred_v, node_v);
if (edge == nullptr)
throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname()));
- RouteCreationArgs* e_route = static_cast<RouteCreationArgs*>(xbt_graph_edge_get_data(edge));
+ const RouteCreationArgs* e_route = static_cast<RouteCreationArgs*>(xbt_graph_edge_get_data(edge));
- NetPoint* prev_gw_src = gw_src;
+ const NetPoint* prev_gw_src = gw_src;
gw_src = e_route->gw_src;
NetPoint* gw_dst = e_route->gw_dst;
for (auto const& link : e_route->link_list) {
route->link_list.insert(route->link_list.begin(), link);
if (lat)
- *lat += static_cast<resource::LinkImpl*>(link)->get_latency();
+ *lat += link->get_latency();
}
}
{
add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
- if (not route_graph_)
- route_graph_ = xbt_graph_new_graph(1, nullptr);
-
new_edge(src->id(), dst->id(), new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1));
if (symmetrical == true)
new_edge(dst->id(), src->id(), new_extended_route(hierarchy_, dst, src, gw_dst, gw_src, link_list, symmetrical, 0));
}
-void DijkstraZone::new_edge(int src_id, int dst_id, simgrid::kernel::routing::RouteCreationArgs* route)
+void DijkstraZone::new_edge(int src_id, int dst_id, RouteCreationArgs* route)
{
XBT_DEBUG("Create Route from '%d' to '%d'", src_id, dst_id);
dst = route_graph_new_node(dst_id);
// Make sure that this graph edge was not already added to the graph
- if (xbt_graph_get_edge(route_graph_, src, dst) != nullptr) {
+ if (xbt_graph_get_edge(route_graph_.get(), src, dst) != nullptr) {
if (route->gw_dst == nullptr || route->gw_src == nullptr)
throw std::invalid_argument(
xbt::string_printf("Route from %s to %s already exists", route->src->get_cname(), route->dst->get_cname()));
}
// Finally add it
- xbt_graph_new_edge(route_graph_, src, dst, route);
-}
-}
+ xbt_graph_new_edge(route_graph_.get(), src, dst, route);
}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
