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
forgot to recreate the option when reviving supernovae
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
flatifier.c
diff --git
a/teshsuite/simdag/platforms/flatifier.c
b/teshsuite/simdag/platforms/flatifier.c
index
e7321c9
..
1f1c663
100644
(file)
--- a/
teshsuite/simdag/platforms/flatifier.c
+++ b/
teshsuite/simdag/platforms/flatifier.c
@@
-88,7
+88,7
@@
int main(int argc, char **argv)
SD_workstation_get_name(hosts[i]),
SD_workstation_get_power(hosts[i]));
props = SD_workstation_get_properties(hosts[i]);
SD_workstation_get_name(hosts[i]),
SD_workstation_get_power(hosts[i]));
props = SD_workstation_get_properties(hosts[i]);
- if (props &&
xbt_dict_length(props) > 0
) {
+ if (props &&
!xbt_dict_is_empty(props)
) {
printf(">\n");
xbt_dict_foreach(props, cursor, key, data) {
printf(" <prop id=\"%s\" value=\"%s\"/>\n", key, data);
printf(">\n");
xbt_dict_foreach(props, cursor, key, data) {
printf(" <prop id=\"%s\" value=\"%s\"/>\n", key, data);
@@
-136,7
+136,8
@@
int main(int argc, char **argv)
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(src,dst,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-149,11
+150,12
@@
int main(int argc, char **argv)
}
xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
{
}
xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
{
- if(get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+ if(
routing_
get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(src,dst,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-169,14
+171,15
@@
int main(int argc, char **argv)
xbt_lib_foreach(as_router_lib, cursor_src, src, value) // Routes from router
{
xbt_lib_foreach(as_router_lib, cursor_src, src, value) // Routes from router
{
- if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
+ if(
routing_
get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
{
xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
{
- if(get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+ if(
routing_
get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
printf(" <route src=\"%s\" dst=\"%s\">\n "
,src
,dst);
- xbt_dynar_t route = global_routing->get_route(src,dst);
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(src,dst,&route,NULL);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
@@
-191,9
+194,9
@@
int main(int argc, char **argv)
xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
{
printf(" <route src=\"%s\" dst=\"%s\">\n "
xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
{
printf(" <route src=\"%s\" dst=\"%s\">\n "
- ,src
-
,dst)
;
-
xbt_dynar_t route = global_routing->get_route(src,dst
);
+ ,src
, dst);
+
xbt_dynar_t route=NULL
;
+
routing_get_route_and_latency(src,dst,&route, NULL
);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);
for(i=0;i<xbt_dynar_length(route) ;i++)
{
void *link = xbt_dynar_get_as(route,i,void *);