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
don't load private headers from C tests: they will turn to C++
[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
86ac354
..
bcefb82
100644
(file)
--- a/
teshsuite/simdag/platforms/is_router_test.c
+++ b/
teshsuite/simdag/platforms/is_router_test.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
2
. The SimGrid Team.
+/* Copyright (c) 2008-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-6,28
+6,32
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
-
-extern routing_platf_t routing_platf;
+#include "simgrid/simdag.h"
+#include "surf/surf.h"
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- /*
initialisation of SD
*/
+ /*
SD initialization
*/
int size;
int size;
- SD_init(&argc, argv);
xbt_lib_cursor_t cursor = NULL;
char *key, *data;
xbt_lib_cursor_t cursor = NULL;
char *key, *data;
+#ifdef _XBT_WIN32
+ setbuf(stderr, NULL);
+ setbuf(stdout, NULL);
+#endif
+
+ SD_init(&argc, argv);
+
/* creation of the environment */
SD_create_environment(argv[1]);
/* creation of the environment */
SD_create_environment(argv[1]);
- size = xbt_
lib_length(host_lib
) + xbt_lib_length(as_router_lib);
+ size = xbt_
dict_length(host_list
) + xbt_lib_length(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: %
zu
, link number: %d, elmts number: %d\n",
+
sg_host_count(), sg_link_count
(), size);
- xbt_
lib_foreach(host_lib
, cursor, key, data) {
+ xbt_
dict_foreach(host_list
, cursor, key, data) {
printf(" - Seen: \"%s\" is type : %d\n", key,
(int) routing_get_network_element_type(key));
}
printf(" - Seen: \"%s\" is type : %d\n", key,
(int) routing_get_network_element_type(key));
}