git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8398
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
case 1:
surf_parse_get_int(&start,
xbt_dynar_get_as(radical_ends, 0, char *));
case 1:
surf_parse_get_int(&start,
xbt_dynar_get_as(radical_ends, 0, char *));
- host_id = bprintf("%s_%d%s", cluster_prefix, start, cluster_suffix);
+ host_id = bprintf("%s%d%s", cluster_prefix, start, cluster_suffix);
#ifndef HAVE_PCRE_LIB
xbt_dynar_push_as(tab_elements_num, int, start);
#endif
#ifndef HAVE_PCRE_LIB
xbt_dynar_push_as(tab_elements_num, int, start);
#endif
surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
DEBUG2("Create hosts and links from %d to %d", start, end);
for (i = start; i <= end; i++) {
surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
DEBUG2("Create hosts and links from %d to %d", start, end);
for (i = start; i <= end; i++) {
- host_id = bprintf("%s_%d%s", cluster_prefix, i, cluster_suffix);
+ host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
#ifndef HAVE_PCRE_LIB
xbt_dynar_push_as(tab_elements_num, int, i);
#endif
#ifndef HAVE_PCRE_LIB
xbt_dynar_push_as(tab_elements_num, int, i);
#endif
- bprintf("%s_%s_router%s", cluster_prefix, cluster_id,
+ bprintf("%s%s_router%s", cluster_prefix, cluster_id,
cluster_suffix);
link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id);
link_backbone = bprintf("%s_backbone", cluster_id);
cluster_suffix);
link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id);
link_backbone = bprintf("%s_backbone", cluster_id);
new_suffix = bprintf("%s\\.%s", new_suffix, groups);
}
}
new_suffix = bprintf("%s\\.%s", new_suffix, groups);
}
}
- route_src_dst = bprintf("%s_(.*)%s", cluster_prefix, new_suffix);
+ route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix);
route_src = router_id;
} else {
route_src =
route_src = router_id;
} else {
route_src =
- bprintf("%s_%d%s", cluster_prefix,
+ bprintf("%s%d%s", cluster_prefix,
xbt_dynar_get_as(tab_elements_num, i, int),
cluster_suffix);
}
xbt_dynar_get_as(tab_elements_num, i, int),
cluster_suffix);
}
route_dst = router_id;
} else {
route_dst =
route_dst = router_id;
} else {
route_dst =
- bprintf("%s_%d%s", cluster_prefix,
+ bprintf("%s%d%s", cluster_prefix,
xbt_dynar_get_as(tab_elements_num, j, int),
cluster_suffix);
}
xbt_dynar_get_as(tab_elements_num, j, int),
cluster_suffix);
}
<link id="backbone" bandwidth="1250000000" latency="5E-4"/>
<link id="backbone" bandwidth="1250000000" latency="5E-4"/>
- <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bob_bob_cluster_router.hamburger.edu" gw_dst="alice_alice_cluster_router.crepe.fr">
+ <ASroute src="bob_cluster" dst="alice_cluster"
+ gw_src="bobbob_cluster_router.hamburger.edu"
+ gw_dst="alicealice_cluster_router.crepe.fr">
<link_ctn id="backbone"/>
</ASroute>
<link_ctn id="backbone"/>
</ASroute>
- <ASroute src="alice_cluster" dst="bob_cluster" gw_src="alice_alice_cluster_router.crepe.fr" gw_dst="bob_bob_cluster_router.hamburger.edu">
+ <ASroute src="alice_cluster" dst="bob_cluster"
+ gw_src="alicealice_cluster_router.crepe.fr"
+ gw_dst="bobbob_cluster_router.hamburger.edu">
<link_ctn id="backbone"/>
</ASroute>
<link_ctn id="backbone"/>
</ASroute>
<ASroute
src="bob_cluster"
dst="bob_cluster_1"
<ASroute
src="bob_cluster"
dst="bob_cluster_1"
- gw_src="bob_bob_cluster_router.hamburger.edu"
- gw_dst="bob_bob_cluster_1_router.hamburger.edu">
+ gw_src="bobbob_cluster_router.hamburger.edu"
+ gw_dst="bobbob_cluster_1_router.hamburger.edu">
<link_ctn id="backbone"/>
</ASroute>
<ASroute
src="bob_cluster_1"
dst="bob_cluster"
<link_ctn id="backbone"/>
</ASroute>
<ASroute
src="bob_cluster_1"
dst="bob_cluster"
- gw_src="bob_bob_cluster_1_router.hamburger.edu"
- gw_dst="bob_bob_cluster_router.hamburger.edu">
+ gw_src="bobbob_cluster_1_router.hamburger.edu"
+ gw_dst="bobbob_cluster_router.hamburger.edu">
<link_ctn id="backbone"/>
</ASroute>
<link_ctn id="backbone"/>
</ASroute>