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
requests the flatifier to display the amount of core if not equal to 1
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
flatifier.c
diff --git
a/teshsuite/simdag/platforms/flatifier.c
b/teshsuite/simdag/platforms/flatifier.c
index
dad86de
..
e0762b0
100644
(file)
--- a/
teshsuite/simdag/platforms/flatifier.c
+++ b/
teshsuite/simdag/platforms/flatifier.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008
, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2008
-2014
. 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
@@
-74,9
+74,9
@@
static void create_environment(xbt_os_timer_t parse_time, const char *platformFi
{
xbt_ex_t e;
TRY {
{
xbt_ex_t e;
TRY {
- xbt_os_timer_start(parse_time);
+ xbt_os_
cpu
timer_start(parse_time);
SD_create_environment(platformFile);
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);
}
CATCH(e) {
xbt_die("Error while loading %s: %s", platformFile, e.msg);
@@
-104,7
+104,12
@@
int main(int argc, char **argv)
const SD_link_t *links;
xbt_os_timer_t parse_time = xbt_os_timer_new();
const SD_link_t *links;
xbt_os_timer_t parse_time = xbt_os_timer_new();
+#ifdef _XBT_WIN32
+ setbuf(stderr, NULL);
+ setbuf(stdout, NULL);
+#else
setvbuf(stdout, NULL, _IOLBF, 0);
setvbuf(stdout, NULL, _IOLBF, 0);
+#endif
SD_init(&argc, argv);
SD_init(&argc, argv);
@@
-142,6
+147,9
@@
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 (SD_workstation_get_cores(hosts[i])>1) {
+ printf(" cores=\"%d\"", SD_workstation_get_cores(hosts[i]));
+ }
if (props && !xbt_dict_is_empty(props)) {
printf(">\n");
xbt_dict_foreach(props, cursor, key, data) {
if (props && !xbt_dict_is_empty(props)) {
printf(">\n");
xbt_dict_foreach(props, cursor, key, data) {
@@
-155,8
+163,8
@@
int main(int argc, char **argv)
// Routers
xbt_lib_foreach(as_router_lib, cursor_src, key, value1) {
// 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);
}
{
printf(" <router id=\"%s\"/>\n",key);
}
@@
-198,7
+206,7
@@
int main(int argc, char **argv)
{
void *link = xbt_dynar_get_as(route,i,void *);
{
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);
}
printf("<%s id=\"%s\"/>",link_ctn,link_name);
free(link_name);
}
@@
-217,7
+225,7
@@
int main(int argc, char **argv)
{
void *link = xbt_dynar_get_as(route,i,void *);
{
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);
}
printf("<%s id=\"%s\"/>",link_ctn,link_name);
free(link_name);
}
@@
-243,7
+251,7
@@
int main(int argc, char **argv)
{
void *link = xbt_dynar_get_as(route,i,void *);
{
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);
}
printf("<%s id=\"%s\"/>",link_ctn,link_name);
free(link_name);
}
@@
-261,7
+269,7
@@
int main(int argc, char **argv)
{
void *link = xbt_dynar_get_as(route,i,void *);
{
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);
}
printf("<%s id=\"%s\"/>",link_ctn,link_name);
free(link_name);
}
@@
-275,6
+283,7
@@
int main(int argc, char **argv)
printf("</platform>\n");
}
SD_exit();
printf("</platform>\n");
}
SD_exit();
+ xbt_os_timer_free(parse_time);
return 0;
}
return 0;
}