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
Use existing xbt_swag_reset().
[simgrid.git]
/
src
/
surf
/
surf_routing_cluster.c
diff --git
a/src/surf/surf_routing_cluster.c
b/src/surf/surf_routing_cluster.c
index
9a8a411
..
52cc059
100644
(file)
--- a/
src/surf/surf_routing_cluster.c
+++ b/
src/surf/surf_routing_cluster.c
@@
-20,7
+20,7
@@
typedef struct {
/* Business methods */
static void cluster_get_route_and_latency(AS_t as,
/* Business methods */
static void cluster_get_route_and_latency(AS_t as,
-
network_element_t src, network_element
_t dst,
+
sg_routing_edge_t src, sg_routing_edge
_t dst,
route_t route, double *lat) {
s_surf_parsing_link_up_down_t info;
route_t route, double *lat) {
s_surf_parsing_link_up_down_t info;
@@
-58,15
+58,15
@@
static void model_cluster_finalize(AS_t as) {
model_none_finalize(as);
}
model_none_finalize(as);
}
-static int cluster_parse_PU(AS_t rc,
network_element
_t elm) {
+static int cluster_parse_PU(AS_t rc,
sg_routing_edge
_t elm) {
XBT_DEBUG("Load process unit \"%s\"", elm->name);
XBT_DEBUG("Load process unit \"%s\"", elm->name);
- xbt_dynar_push_as(rc->index_network_elm,
network_element
_t,elm);
+ xbt_dynar_push_as(rc->index_network_elm,
sg_routing_edge
_t,elm);
return xbt_dynar_length(rc->index_network_elm)-1;
}
return xbt_dynar_length(rc->index_network_elm)-1;
}
-static int cluster_parse_AS(AS_t rc,
network_element
_t elm) {
+static int cluster_parse_AS(AS_t rc,
sg_routing_edge
_t elm) {
XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
- xbt_dynar_push_as(rc->index_network_elm,
network_element
_t,elm);
+ xbt_dynar_push_as(rc->index_network_elm,
sg_routing_edge
_t,elm);
return xbt_dynar_length(rc->index_network_elm)-1;
}
return xbt_dynar_length(rc->index_network_elm)-1;
}