X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..7ad85b03568dabade546f7948aaf7279059e9269:/src/simix/smx_environment.c diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c index 7317c366c8..9b4c6db82b 100644 --- a/src/simix/smx_environment.c +++ b/src/simix/smx_environment.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2014. The SimGrid Team. +/* Copyright (c) 2007-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -33,33 +33,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix, */ void SIMIX_create_environment(const char *file) { - double start, end; - - start = xbt_os_time(); + double start = 0, end = 0; + if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug)) + start = xbt_os_time(); parse_platform_file(file); - end = xbt_os_time(); + if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug)) + end = xbt_os_time(); XBT_DEBUG("PARSE TIME: %g", (end - start)); } -void SIMIX_post_create_environment(void) { - - void **workstation = NULL; - void **storage = NULL; - xbt_lib_cursor_t cursor = NULL; - char *name = NULL; - - /* Create host at SIMIX level */ - xbt_lib_foreach(host_lib, cursor, name, workstation) { - if(workstation[SURF_WKS_LEVEL]) - SIMIX_host_create(name, workstation[SURF_WKS_LEVEL], NULL); - } - - /* Create storage at SIMIX level */ - xbt_lib_foreach(storage_lib, cursor, name, storage) { - if(storage[SURF_STORAGE_LEVEL]) - SIMIX_storage_create(name, storage[SURF_STORAGE_LEVEL], NULL); - } - +void SIMIX_post_create_environment(void) +{ surf_presolve(); }