-/* 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");
/* Free functions */
-static void route_cache_elem_free(void* e)
-{
- route_cache_element_t elm = (route_cache_element_t)e;
- if (elm) {
- xbt_free(elm->pred_arr);
- xbt_free(elm);
- }
-}
-
-static void graph_node_map_elem_free(void* e)
-{
- graph_node_map_element_t elm = (graph_node_map_element_t)e;
- xbt_free(elm);
-}
-
static void graph_edge_data_free(void* e) // FIXME: useless code duplication
{
sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)e;
/* Create the topology graph */
if (not routeGraph_)
routeGraph_ = xbt_graph_new_graph(1, nullptr);
- 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_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id)
{
- graph_node_data_t data = xbt_new0(struct graph_node_data, 1);
+ graph_node_data_t data = xbt_new0(s_graph_node_data_t, 1);
data->id = id;
data->graph_id = graph_id;
xbt_node_t node = xbt_graph_new_node(routeGraph_, data);
- graph_node_map_element_t elm = xbt_new0(struct graph_node_map_element, 1);
+ graph_node_map_element_t elm = xbt_new0(s_graph_node_map_element_t, 1);
elm->node = node;
- xbt_dict_set_ext(graphNodeMap_, (char*)(&id), sizeof(int), (xbt_dictelm_t)elm, nullptr);
+ graphNodeMap_.insert({id, elm});
return node;
}
graph_node_map_element_t DijkstraZone::nodeMapSearch(int id)
{
- return (graph_node_map_element_t)xbt_dict_get_or_null_ext(graphNodeMap_, (char*)(&id), sizeof(int));
+ auto ret = graphNodeMap_.find(id);
+ return ret == graphNodeMap_.end() ? nullptr : ret->second;
}
/* Parsing */
sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)xbt_graph_edge_get_data(edge);
- for (auto link : *e_route->link_list) {
+ for (auto const& link : *e_route->link_list) {
route->link_list->insert(route->link_list->begin(), link);
if (lat)
*lat += static_cast<surf::LinkImpl*>(link)->latency();
}
route_cache_element_t elm = nullptr;
- if (routeCache_) { /* cache mode */
- elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routeCache_, (char*)(&src_id), sizeof(int));
+ if (not routeCache_.empty()) { /* cache mode */
+ auto it = routeCache_.find(src_id);
+ elm = (it == routeCache_.end()) ? nullptr : it->second;
}
if (elm) { /* cached mode and cache hit */
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 const& link : e_route_as_to_as) {
route->link_list->insert(pos, link);
if (lat)
*lat += link->latency();
}
}
- for (auto link : *e_route->link_list) {
+ for (auto const& link : *e_route->link_list) {
route->link_list->insert(route->link_list->begin(), link);
if (lat)
*lat += static_cast<surf::LinkImpl*>(link)->latency();
route->gw_dst = first_gw;
}
- if (routeCache_ && elm == nullptr) {
+ if (not routeCache_.empty() && elm == nullptr) {
/* add to predecessor list of the current src-host to cache */
- elm = xbt_new0(struct route_cache_element, 1);
+ elm = xbt_new0(s_route_cache_element_t, 1);
elm->pred_arr = pred_arr;
elm->size = size;
- xbt_dict_set_ext(routeCache_, (char*)(&src_id), sizeof(int), (xbt_dictelm_t)elm, nullptr);
+ routeCache_.insert({src_id, elm});
}
- if (not routeCache_)
+ if (routeCache_.empty())
xbt_free(pred_arr);
}
DijkstraZone::~DijkstraZone()
{
xbt_graph_free_graph(routeGraph_, &xbt_free_f, &graph_edge_data_free, &xbt_free_f);
- xbt_dict_free(&graphNodeMap_);
- xbt_dict_free(&routeCache_);
}
/* 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);
}
void DijkstraZone::addRoute(sg_platf_route_cbarg_t route)
/* Create the topology graph */
if (not routeGraph_)
routeGraph_ = xbt_graph_new_graph(1, nullptr);
- 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
* nodes */
// Symmetrical YES
if (route->symmetrical == true) {
- 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,
- route->gw_src->name().c_str());
xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_);
xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src->id(), xbt_node_t);
xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst->id(), xbt_node_t);
xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_e_v, node_s_v);
- if (edge)
- THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, route->gw_dst->name().c_str(), srcName,
+ if (not route->gw_dst || not route->gw_src){
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName);
+ if (edge)
+ THROWF(arg_error, 0, "Route from %s to %s already exists", dstName, srcName);
+ } else {
+ XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, route->gw_dst->name().c_str(), srcName,
+ route->gw_src->name().c_str());
+ if (edge)
+ THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, route->gw_dst->name().c_str(), srcName,
route->gw_src->name().c_str());
+ }
if (route->gw_dst && route->gw_src) {
NetPoint* gw_tmp = route->gw_src;
