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
Remove where_network_elements and add element in host_lib and as_router_lib
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
is_router_test.c
diff --git
a/teshsuite/simdag/platforms/is_router_test.c
b/teshsuite/simdag/platforms/is_router_test.c
index
8a7a508
..
df14488
100644
(file)
--- a/
teshsuite/simdag/platforms/is_router_test.c
+++ b/
teshsuite/simdag/platforms/is_router_test.c
@@
-16,21
+16,27
@@
int main(int argc, char **argv)
/* initialisation of SD */
int size;
SD_init(&argc, argv);
/* initialisation of SD */
int size;
SD_init(&argc, argv);
- xbt_
dict
_cursor_t cursor = NULL;
+ xbt_
lib
_cursor_t cursor = NULL;
char *key, *data;
/* creation of the environment */
SD_create_environment(argv[1]);
char *key, *data;
/* creation of the environment */
SD_create_environment(argv[1]);
- size = xbt_
dict_size(global_routing->where_network_elements
);
+ size = xbt_
lib_size(host_lib) + xbt_lib_size(as_router_lib
);
printf("Workstation number: %d, link number: %d, elmts number: %d\n",
SD_workstation_get_number(), SD_link_get_number(), size);
printf("Workstation number: %d, link number: %d, elmts number: %d\n",
SD_workstation_get_number(), SD_link_get_number(), size);
- xbt_
dict_foreach(global_routing->where_network_elements
, cursor, key, data) {
+ xbt_
lib_foreach(host_lib
, cursor, key, data) {
printf(" - Seen: \"%s\" is type : %d\n", key,
(int) global_routing->get_network_element_type(key));
}
printf(" - Seen: \"%s\" is type : %d\n", key,
(int) global_routing->get_network_element_type(key));
}
+
+ xbt_lib_foreach(as_router_lib, cursor, key, data) {
+ printf(" - Seen: \"%s\" is type : %d\n", key,
+ (int) global_routing->get_network_element_type(key));
+ }
+
SD_exit();
return 0;
}
SD_exit();
return 0;
}