X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09f98aaf70651431716a4f2e068310c215167717..8e8f8b64b899284cbd166542ba352cd0c44059e8:/teshsuite/simdag/platforms/flatifier.c diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c index d45336af6b..dad86de903 100644 --- a/teshsuite/simdag/platforms/flatifier.c +++ b/teshsuite/simdag/platforms/flatifier.c @@ -19,6 +19,7 @@ #include "xbt/log.h" #include "xbt/dict.h" #include "xbt/ex.h" +#include "xbt/xbt_os_time.h" #include "surf/surf.h" #include "surf/surf_private.h" @@ -46,7 +47,7 @@ static int name_compare_links(const void *n1, const void *n2) return strcmp(name1, name2); } -int parse_cmdline(int *timings, int *downgrade, char **platformFile, int argc, char **argv) +static int parse_cmdline(int *timings, int *downgrade, char **platformFile, int argc, char **argv) { int wrong_option = 0; int i; @@ -69,6 +70,19 @@ int parse_cmdline(int *timings, int *downgrade, char **platformFile, int argc, c return wrong_option; } +static void create_environment(xbt_os_timer_t parse_time, const char *platformFile) +{ + xbt_ex_t e; + TRY { + xbt_os_timer_start(parse_time); + SD_create_environment(platformFile); + xbt_os_timer_stop(parse_time); + } + CATCH(e) { + xbt_die("Error while loading %s: %s", platformFile, e.msg); + } +} + int main(int argc, char **argv) { char *platformFile = NULL; @@ -85,7 +99,6 @@ int main(int argc, char **argv) char *src,*dst,*key,*data; sg_routing_edge_t value1; sg_routing_edge_t value2; - xbt_ex_t e; const SD_workstation_t *hosts; const SD_link_t *links; @@ -106,14 +119,7 @@ int main(int argc, char **argv) link_ctn = link_ctn_v2; } - TRY { - xbt_os_timer_start(parse_time); - SD_create_environment(platformFile); - xbt_os_timer_stop(parse_time); - } - CATCH(e) { - xbt_die("Error while loading %s: %s",platformFile,e.msg); - } + create_environment(parse_time, platformFile); if (timings) { XBT_INFO("Parsing time: %fs (%d hosts, %d links)",