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
All hosts types fusion to xbt_dictelm_t
[simgrid.git]
/
src
/
surf
/
surf_routing_none.c
diff --git
a/src/surf/surf_routing_none.c
b/src/surf/surf_routing_none.c
index f605009fcb8bd196726a6d983c23022031cca679..1f403c8f42443b503e1b4a081de4cef644e3738a 100644
(file)
--- a/
src/surf/surf_routing_none.c
+++ b/
src/surf/surf_routing_none.c
@@
-12,23
+12,30
@@
static xbt_dynar_t none_get_onelink_routes(AS_t rc) {
return NULL;
}
return NULL;
}
-static void none_get_route_and_latency(AS_t rc,
const char *src, const char *
dst,
-
route
_t res,double *lat)
+static void none_get_route_and_latency(AS_t rc,
sg_routing_edge_t src, sg_routing_edge_t
dst,
+
sg_platf_route_cbarg
_t res,double *lat)
{
{
+ *lat = 0.0;
}
}
-static
route
_t none_get_bypass_route(AS_t rc,
-
const char *
src,
-
const char *ds
t) {
+static
sg_platf_route_cbarg
_t none_get_bypass_route(AS_t rc,
+
sg_routing_edge_t
src,
+
sg_routing_edge_t dst, double *la
t) {
return NULL;
}
return NULL;
}
-static void none_parse_PU(AS_t rc, const char *name) {
+static int none_parse_PU(AS_t rc, sg_routing_edge_t elm) {
+ XBT_DEBUG("Load process unit \"%s\"", elm->name);
+ xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm);
/* don't care about PUs */
/* don't care about PUs */
+ return -1;
}
}
-static void none_parse_AS(AS_t rc, const char *name) {
+static int none_parse_AS(AS_t rc, sg_routing_edge_t elm) {
+ XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
+ xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm);
/* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
/* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
+ return -1;
}
/* Creation routing model functions */
}
/* Creation routing model functions */
@@
-46,15
+53,17
@@
AS_t model_none_create_sized(size_t childsize) {
new_component->get_onelink_routes = none_get_onelink_routes;
new_component->get_bypass_route = none_get_bypass_route;
new_component->finalize = model_none_finalize;
new_component->get_onelink_routes = none_get_onelink_routes;
new_component->get_bypass_route = none_get_bypass_route;
new_component->finalize = model_none_finalize;
-
new_component->routing_sons = xbt_dict_new_homogeneous(NULL);
new_component->routing_sons = xbt_dict_new_homogeneous(NULL);
+ new_component->index_network_elm = xbt_dynar_new(sizeof(char*),NULL);
return new_component;
}
void model_none_finalize(AS_t as) {
xbt_dict_free(&as->routing_sons);
return new_component;
}
void model_none_finalize(AS_t as) {
xbt_dict_free(&as->routing_sons);
- xbt_free(as->name);
+ xbt_dynar_free(&as->index_network_elm);
+ if(as->link_up_down_list)
+ xbt_dynar_free(&as->link_up_down_list);
xbt_free(as);
}
xbt_free(as);
}