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
Enable clobbered variable warnings again and fix the last one (for me)
[simgrid.git]
/
src
/
surf
/
surf_routing_floyd.c
diff --git
a/src/surf/surf_routing_floyd.c
b/src/surf/surf_routing_floyd.c
index
80856c5
..
e744b86
100644
(file)
--- a/
src/surf/surf_routing_floyd.c
+++ b/
src/surf/surf_routing_floyd.c
@@
-95,8
+95,7
@@
static route_extended_t floyd_get_route(routing_component_t rc,
int first = 1;
int pred = *dst_id;
int prev_pred = 0;
int first = 1;
int pred = *dst_id;
int prev_pred = 0;
- char *gw_src = NULL, *gw_dst =
- NULL, *prev_gw_src, *prev_gw_dst, *first_gw = NULL;
+ char *gw_src = NULL, *gw_dst = NULL, *prev_gw_src, *first_gw = NULL;
unsigned int cpt;
void *link;
xbt_dynar_t links;
unsigned int cpt;
void *link;
xbt_dynar_t links;
@@
-111,7
+110,6
@@
static route_extended_t floyd_get_route(routing_component_t rc,
dst);
prev_gw_src = gw_src;
dst);
prev_gw_src = gw_src;
- prev_gw_dst = gw_dst;
route_extended_t e_route = TO_FLOYD_LINK(pred, prev_pred);
gw_src = e_route->src_gateway;
route_extended_t e_route = TO_FLOYD_LINK(pred, prev_pred);
gw_src = e_route->src_gateway;
@@
-286,6
+284,9
@@
void model_floyd_set_route(routing_component_t rc, const char *src,
src_id = xbt_dict_get_or_null(rc->to_index, src);
dst_id = xbt_dict_get_or_null(rc->to_index, dst);
src_id = xbt_dict_get_or_null(rc->to_index, src);
dst_id = xbt_dict_get_or_null(rc->to_index, dst);
+ xbt_assert(src_id, "Network elements %s not found", src);
+ xbt_assert(dst_id, "Network elements %s not found", dst);
+
if(!routing->link_table)
{
/* Create Cost, Predecessor and Link tables */
if(!routing->link_table)
{
/* Create Cost, Predecessor and Link tables */