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
Replace surf by surf++ and make it compile
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
flatifier.c
diff --git
a/teshsuite/simdag/platforms/flatifier.c
b/teshsuite/simdag/platforms/flatifier.c
index
5f5d48d
..
e2bd77c
100644
(file)
--- a/
teshsuite/simdag/platforms/flatifier.c
+++ b/
teshsuite/simdag/platforms/flatifier.c
@@
-74,9
+74,9
@@
static void create_environment(xbt_os_timer_t parse_time, const char *platformFi
{
xbt_ex_t e;
TRY {
- xbt_os_timer_start(parse_time);
+ xbt_os_
cpu
timer_start(parse_time);
SD_create_environment(platformFile);
- xbt_os_timer_stop(parse_time);
+ xbt_os_
cpu
timer_stop(parse_time);
}
CATCH(e) {
xbt_die("Error while loading %s: %s", platformFile, e.msg);
@@
-155,8
+155,8
@@
int main(int argc, char **argv)
// Routers
xbt_lib_foreach(as_router_lib, cursor_src, key, value1) {
- if(
((sg_routing_edge_t)
xbt_lib_get_or_null(as_router_lib, key,
- ROUTING_ASR_LEVEL))
->rc_type
== SURF_NETWORK_ELEMENT_ROUTER)
+ if(
surf_routing_edge_get_rc_type(
xbt_lib_get_or_null(as_router_lib, key,
+ ROUTING_ASR_LEVEL)) == SURF_NETWORK_ELEMENT_ROUTER)
{
printf(" <router id=\"%s\"/>\n",key);
}
@@
-198,7
+198,7
@@
int main(int argc, char **argv)
{
void *link = xbt_dynar_get_as(route,i,void *);
- char *link_name = xbt_strdup(
((surf_resource_t)link)->name
);
+ char *link_name = xbt_strdup(
surf_resource_name(link)
);
printf("<%s id=\"%s\"/>",link_ctn,link_name);
free(link_name);
}
@@
-217,7
+217,7
@@
int main(int argc, char **argv)
{
void *link = xbt_dynar_get_as(route,i,void *);
- char *link_name = xbt_strdup(
((surf_resource_t)link)->name
);
+ char *link_name = xbt_strdup(
surf_resource_name(link)
);
printf("<%s id=\"%s\"/>",link_ctn,link_name);
free(link_name);
}
@@
-243,7
+243,7
@@
int main(int argc, char **argv)
{
void *link = xbt_dynar_get_as(route,i,void *);
- char *link_name = xbt_strdup(
((surf_resource_t)link)->name
);
+ char *link_name = xbt_strdup(
surf_resource_name(link)
);
printf("<%s id=\"%s\"/>",link_ctn,link_name);
free(link_name);
}
@@
-261,7
+261,7
@@
int main(int argc, char **argv)
{
void *link = xbt_dynar_get_as(route,i,void *);
- char *link_name = xbt_strdup(
((surf_resource_t)link)->name
);
+ char *link_name = xbt_strdup(
surf_resource_name(link)
);
printf("<%s id=\"%s\"/>",link_ctn,link_name);
free(link_name);
}