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
46ae1b4
..
e0762b0
100644
(file)
--- a/
teshsuite/simdag/platforms/flatifier.c
+++ b/
teshsuite/simdag/platforms/flatifier.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
3
. The SimGrid Team.
+/* Copyright (c) 2008-201
4
. 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
@@
-147,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) {
@@
-160,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);
}
@@
-203,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);
}
@@
-222,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);
}
@@
-248,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);
}
@@
-266,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);
}