A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill useless code now that As::Seal() exists
[simgrid.git]
/
src
/
surf
/
surf_routing_dijkstra.cpp
diff --git
a/src/surf/surf_routing_dijkstra.cpp
b/src/surf/surf_routing_dijkstra.cpp
index
f6d146d
..
ccdeaad
100644
(file)
--- a/
src/surf/surf_routing_dijkstra.cpp
+++ b/
src/surf/surf_routing_dijkstra.cpp
@@
-1,14
+1,12
@@
-/* Copyright (c) 2009-201
4
. The SimGrid Team.
+/* Copyright (c) 2009-201
5
. 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. */
* 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 "surf_routing_dijkstra.hpp"
-#include "network_interface.hpp"
-
-/* Global vars */
-extern routing_platf_t routing_platf;
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_dijkstra.hpp"
+#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
@@
-39,44
+37,43
@@
static void graph_edge_data_free(void *e) // FIXME: useless code duplication
}
AS_t model_dijkstra_create(void){
}
AS_t model_dijkstra_create(void){
- return new AsDijkstra(0);
+ return new
simgrid::surf::
AsDijkstra(0);
}
AS_t model_dijkstracache_create(void){
}
AS_t model_dijkstracache_create(void){
- return new AsDijkstra(1);
+ return new
simgrid::surf::
AsDijkstra(1);
}
}
-void model_dijkstra_both_end(AS_t as)
-{
- AsDijkstra *THIS_AS = static_cast<AsDijkstra*>(as);
- xbt_node_t node = NULL;
- unsigned int cursor2;
- xbt_dynar_t nodes = NULL;
+/* Utility functions */
+namespace simgrid {
+namespace surf {
+void AsDijkstra::Seal()
+{
/* Create the topology graph */
/* Create the topology graph */
- if(!
THIS_AS->
p_routeGraph)
-
THIS_AS->
p_routeGraph = xbt_graph_new_graph(1, NULL);
- if(!
THIS_AS->
p_graphNodeMap)
-
THIS_AS->
p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
+ if(!p_routeGraph)
+ p_routeGraph = xbt_graph_new_graph(1, NULL);
+ if(!p_graphNodeMap)
+ p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
- if (
THIS_AS->m_cached && !THIS_AS->
p_routeCache)
-
THIS_AS->
p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free);
+ if (
m_cached && !
p_routeCache)
+ p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free);
/* Add the loopback if needed */
/* Add the loopback if needed */
- if (routing_platf->p_loopback &&
as->
p_hierarchy == SURF_ROUTING_BASE)
-
THIS_AS->
addLoopback();
+ if (routing_platf->p_loopback && p_hierarchy == SURF_ROUTING_BASE)
+ addLoopback();
/* initialize graph indexes in nodes after graph has been built */
/* initialize graph indexes in nodes after graph has been built */
-
nodes = xbt_graph_get_nodes(THIS_AS->
p_routeGraph);
+
xbt_dynar_t nodes = xbt_graph_get_nodes(
p_routeGraph);
+ xbt_node_t node = NULL;
+ unsigned int cursor2;
xbt_dynar_foreach(nodes, cursor2, node) {
graph_node_data_t data = (graph_node_data_t) xbt_graph_node_get_data(node);
data->graph_id = cursor2;
}
}
xbt_dynar_foreach(nodes, cursor2, node) {
graph_node_data_t data = (graph_node_data_t) xbt_graph_node_get_data(node);
data->graph_id = cursor2;
}
}
-/* Utility functions */
-
xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id)
{
xbt_node_t node = NULL;
xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id)
{
xbt_node_t node = NULL;
@@
-91,7
+88,7
@@
xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id)
elm = xbt_new0(struct graph_node_map_element, 1);
elm->node = node;
xbt_dict_set_ext(p_graphNodeMap, (char *) (&id), sizeof(int),
elm = xbt_new0(struct graph_node_map_element, 1);
elm->node = node;
xbt_dict_set_ext(p_graphNodeMap, (char *) (&id), sizeof(int),
- (xbt_
set_
elm_t) elm, NULL);
+ (xbt_
dict
elm_t) elm, NULL);
return node;
}
return node;
}
@@
-174,20
+171,20
@@
void AsDijkstra::addLoopback() {
}
}
}
}
-xbt_dynar_t AsDijkstra::getOne
l
inkRoutes()
+xbt_dynar_t AsDijkstra::getOne
L
inkRoutes()
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
int src,dst;
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
int src,dst;
-
RoutingEdge
*src_elm, *dst_elm;
+
NetCard
*src_elm, *dst_elm;
int table_size = (int)xbt_dynar_length(p_indexNetworkElm);
for(src=0; src < table_size; src++) {
for(dst=0; dst< table_size; dst++) {
xbt_dynar_reset(route->link_list);
int table_size = (int)xbt_dynar_length(p_indexNetworkElm);
for(src=0; src < table_size; src++) {
for(dst=0; dst< table_size; dst++) {
xbt_dynar_reset(route->link_list);
- src_elm = xbt_dynar_get_as(p_indexNetworkElm, src,
RoutingEdge
*);
- dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst,
RoutingEdge
*);
+ src_elm = xbt_dynar_get_as(p_indexNetworkElm, src,
NetCard
*);
+ dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst,
NetCard
*);
this->getRouteAndLatency(src_elm, dst_elm,route, NULL);
if (xbt_dynar_length(route->link_list) == 1) {
this->getRouteAndLatency(src_elm, dst_elm,route, NULL);
if (xbt_dynar_length(route->link_list) == 1) {
@@
-206,7
+203,7
@@
xbt_dynar_t AsDijkstra::getOnelinkRoutes()
return ret;
}
return ret;
}
-void AsDijkstra::getRouteAndLatency(
RoutingEdge *src, RoutingEdge
*dst, sg_platf_route_cbarg_t route, double *lat)
+void AsDijkstra::getRouteAndLatency(
NetCard *src, NetCard
*dst, sg_platf_route_cbarg_t route, double *lat)
{
/* set utils vars */
{
/* set utils vars */
@@
-330,8
+327,8
@@
void AsDijkstra::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf
}
/* compose route path with links */
}
/* compose route path with links */
-
RoutingEdge
*gw_src = NULL, *gw_dst, *prev_gw_src, *first_gw = NULL;
-
RoutingEdge
*gw_dst_net_elm = NULL, *prev_gw_src_net_elm = NULL;
+
NetCard
*gw_src = NULL, *gw_dst, *prev_gw_src, *first_gw = NULL;
+
NetCard
*gw_dst_net_elm = NULL, *prev_gw_src_net_elm = NULL;
for (v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
xbt_node_t node_pred_v =
for (v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
xbt_node_t node_pred_v =
@@
-389,7
+386,7
@@
void AsDijkstra::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf
elm->pred_arr = pred_arr;
elm->size = size;
xbt_dict_set_ext(p_routeCache, (char *) (&src_id), sizeof(int),
elm->pred_arr = pred_arr;
elm->size = size;
xbt_dict_set_ext(p_routeCache, (char *) (&src_id), sizeof(int),
- (xbt_
set_
elm_t) elm, NULL);
+ (xbt_
dict
elm_t) elm, NULL);
}
if (!m_cached)
}
if (!m_cached)
@@
-407,13
+404,10
@@
AsDijkstra::~AsDijkstra()
/* Creation routing model functions */
/* Creation routing model functions */
-AsDijkstra::AsDijkstra() : AsGeneric(), m_cached(0) {
- p_routeGraph = NULL;
- p_graphNodeMap = NULL;
- p_routeCache = NULL;
+AsDijkstra::AsDijkstra() : AsGeneric() {
}
}
-AsDijkstra::AsDijkstra(
int
cached) : AsGeneric(), m_cached(cached)
+AsDijkstra::AsDijkstra(
bool
cached) : AsGeneric(), m_cached(cached)
{
p_routeGraph = NULL;
p_graphNodeMap = NULL;
{
p_routeGraph = NULL;
p_graphNodeMap = NULL;
@@
-436,7
+430,7
@@
void AsDijkstra::end()
/* Create the topology graph */
if(!p_routeGraph)
/* Create the topology graph */
if(!p_routeGraph)
-
p_routeGraph = xbt_graph_new_graph(1, NULL);
+ p_routeGraph = xbt_graph_new_graph(1, NULL);
if(!p_graphNodeMap)
p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
if(!p_graphNodeMap)
p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
@@
-480,10
+474,10
@@
void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->getName());
}
surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->getName());
}
-
RoutingEdge
*src_net_elm, *dst_net_elm;
+
NetCard
*src_net_elm, *dst_net_elm;
- src_net_elm = sg_
routing_edge
_by_name_or_null(src);
- dst_net_elm = sg_
routing_edge
_by_name_or_null(dst);
+ src_net_elm = sg_
netcard
_by_name_or_null(src);
+ dst_net_elm = sg_
netcard
_by_name_or_null(dst);
xbt_assert(src_net_elm, "Network elements %s not found", src);
xbt_assert(dst_net_elm, "Network elements %s not found", dst);
xbt_assert(src_net_elm, "Network elements %s not found", src);
xbt_assert(dst_net_elm, "Network elements %s not found", dst);
@@
-521,7
+515,7
@@
void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
THROWF(arg_error,0,"(AS)Route from '%s' to '%s' already exists",src,dst);
if (route->gw_dst && route->gw_src) {
THROWF(arg_error,0,"(AS)Route from '%s' to '%s' already exists",src,dst);
if (route->gw_dst && route->gw_src) {
-
RoutingEdge
*gw_tmp;
+
NetCard
*gw_tmp;
gw_tmp = route->gw_src;
route->gw_src = route->gw_dst;
route->gw_dst = gw_tmp;
gw_tmp = route->gw_src;
route->gw_src = route->gw_dst;
route->gw_dst = gw_tmp;
@@
-531,3
+525,6
@@
void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
}
xbt_dynar_free(&route->link_list);
}
}
xbt_dynar_free(&route->link_list);
}
+
+}
+}