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
plug a memleak when the cluster's router_id is not given
[simgrid.git]
/
src
/
instr
/
instr_routing.c
diff --git
a/src/instr/instr_routing.c
b/src/instr/instr_routing.c
index
ae62d45
..
765dcea
100644
(file)
--- a/
src/instr/instr_routing.c
+++ b/
src/instr/instr_routing.c
@@
-190,19
+190,19
@@
static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link)
{
container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
- double bandwidth_value = link->
V_link_
bandwidth;
- double latency_value = link->
V_link_
latency;
+ double bandwidth_value = link->bandwidth;
+ double latency_value = link->latency;
xbt_dynar_t links_to_create = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
- if (link->
V_link_sharing_policy == A_surfxml_link_sharing_policy
_FULLDUPLEX){
- char *up = bprintf("%s_UP", link->
V_link_
id);
- char *down = bprintf("%s_DOWN", link->
V_link_
id);
+ if (link->
policy == SURF_LINK
_FULLDUPLEX){
+ char *up = bprintf("%s_UP", link->id);
+ char *down = bprintf("%s_DOWN", link->id);
xbt_dynar_push_as (links_to_create, char*, xbt_strdup(up));
xbt_dynar_push_as (links_to_create, char*, xbt_strdup(down));
free (up);
free (down);
}else{
- xbt_dynar_push_as (links_to_create, char*, strdup(link->
V_link_
id));
+ xbt_dynar_push_as (links_to_create, char*, strdup(link->id));
}
char *link_name = NULL;
@@
-228,11
+228,11
@@
static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link)
static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host)
{
container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
- container_t new = newContainer (host->
V_host_
id, INSTR_HOST, father);
+ container_t new = newContainer (host->id, INSTR_HOST, father);
if (TRACE_categorized() || TRACE_uncategorized()) {
type_t power = getVariableType ("power", NULL, new->type);
- new_pajeSetVariable (0, new, power, host->
V_host_
power_peak);
+ new_pajeSetVariable (0, new, power, host->power_peak);
}
if (TRACE_uncategorized()){
getVariableType ("power_used", "0.5 0.5 0.5", new->type);
@@
-269,7
+269,7
@@
static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host)
static void instr_routing_parse_start_router (sg_platf_router_cbarg_t router)
{
container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
- newContainer (router->
V_router_
id, INSTR_ROUTER, father);
+ newContainer (router->id, INSTR_ROUTER, father);
}
static void instr_routing_parse_end_platform ()