X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/529000951f78d95e3e299d381b6f05a202d59993..d861bc80d3c22ad9e6dd46b89883523d10d07cb2:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 8b941e63cb..f0f168fbe8 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -52,7 +52,7 @@ void SD_init(int *argc, char **argv) s_SD_task_t task; - xbt_assert0(!SD_INITIALISED(), "SD_init() already called"); + xbt_assert(!SD_INITIALISED(), "SD_init() already called"); /* Connect our log channels: that must be done manually under windows */ XBT_LOG_CONNECT(sd_kernel, sd); @@ -185,7 +185,7 @@ void SD_create_environment(const char *platform_file) void **surf_workstation = NULL; void **surf_link = NULL; - platform_filename = bprintf("%s",platform_file); + platform_filename = xbt_strdup(platform_file); // Reset callbacks surf_parse_reset_callbacks(); @@ -421,10 +421,8 @@ void SD_exit(void) xbt_swag_free(sd_global->done_task_set); xbt_swag_free(sd_global->failed_task_set); - // Exit the LIB host_lib - xbt_lib_free(&host_lib); - xbt_lib_free(&link_lib); - xbt_lib_free(&as_router_lib); + XBT_DEBUG("Exiting Surf..."); + surf_exit(); xbt_free(sd_global); sd_global = NULL; @@ -437,9 +435,6 @@ void SD_exit(void) jedule_sd_cleanup(); #endif - XBT_DEBUG("Exiting Surf..."); - surf_exit(); - } else { XBT_WARN("SD_exit() called, but SimDag is not running"); /* we cannot use exceptions here because xbt is not running! */ @@ -447,7 +442,7 @@ void SD_exit(void) } /** - * \bried load script file + * \brief load script file */ void SD_load_environment_script(const char *script_file)