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
I said no sets, even in dicts
[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
50408cf
..
be44ced
100644
(file)
--- a/
src/surf/surf_routing_dijkstra.cpp
+++ b/
src/surf/surf_routing_dijkstra.cpp
@@
-4,8
+4,9
@@
/* 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. */
/* 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"
+#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");
@@
-36,16
+37,17
@@
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)
{
}
void model_dijkstra_both_end(AS_t as)
{
- AsDijkstra *THIS_AS = static_cast<AsDijkstra*>(as);
+ simgrid::surf::AsDijkstra *THIS_AS
+ = static_cast<simgrid::surf::AsDijkstra*>(as);
xbt_node_t node = NULL;
unsigned int cursor2;
xbt_dynar_t nodes = NULL;
xbt_node_t node = NULL;
unsigned int cursor2;
xbt_dynar_t nodes = NULL;
@@
-74,6
+76,9
@@
void model_dijkstra_both_end(AS_t as)
/* Utility functions */
/* Utility functions */
+namespace simgrid {
+namespace surf {
+
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;
@@
-88,7
+93,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;
}
@@
-171,20
+176,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) {
@@
-203,7
+208,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 */
@@
-327,8
+332,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 =
@@
-386,7
+391,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)
@@
-404,13
+409,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;
@@
-477,10
+479,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);
@@
-518,7
+520,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;
@@
-528,3
+530,6
@@
void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
}
xbt_dynar_free(&route->link_list);
}
}
xbt_dynar_free(&route->link_list);
}
+
+}
+}