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
A message changed its category.
[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
3520683
..
df14488
100644
(file)
--- a/
teshsuite/simdag/platforms/is_router_test.c
+++ b/
teshsuite/simdag/platforms/is_router_test.c
@@
-15,24
+15,28
@@
int main(int argc, char **argv)
{
/* initialisation of SD */
int size;
- xbt_dict_t eltms = xbt_dict_new();
SD_init(&argc, argv);
- xbt_
dict_cursor_t cursor=
NULL;
-
char *key,
*data;
+ xbt_
lib_cursor_t cursor =
NULL;
+
char *key,
*data;
/* creation of the environment */
SD_create_environment(argv[1]);
- eltms = global_routing->where_network_elements;
- size = xbt_dict_size(eltms);
+ 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(eltms,cursor,key,data) {
- printf(" - Seen: \"%s\" is type : %d\n",key,(int) global_routing->get_network_element_type(key));
+ 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("%s is router : %d\n",name1,global_routing->is_router(name1));
- xbt_dict_free(&eltms);
+
+ 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;
}