X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50486ccd16de39a3659592fab44adfaf3104a086..217b4afb954d1795f011f060767b8d89533f2b71:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 3f1ceb96ac..31ad28ecb1 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -30,10 +30,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, SD_global_t sd_global = NULL; -XBT_LOG_EXTERNAL_CATEGORY(sd_kernel); -XBT_LOG_EXTERNAL_CATEGORY(sd_task); -XBT_LOG_EXTERNAL_CATEGORY(sd_workstation); - /** * \brief Initialises SD internal data * @@ -54,12 +50,6 @@ void SD_init(int *argc, char **argv) xbt_assert(sd_global == NULL, "SD_init() already called"); - /* Connect our log channels: that must be done manually under windows */ - XBT_LOG_CONNECT(sd_kernel, sd); - XBT_LOG_CONNECT(sd_task, sd); - XBT_LOG_CONNECT(sd_workstation, sd); - - sd_global = xbt_new(s_SD_global_t, 1); sd_global->workstation_list = NULL; sd_global->link_list = NULL; @@ -411,15 +401,16 @@ void SD_exit(void) xbt_swag_free(sd_global->failed_task_set); xbt_swag_free(sd_global->return_set); +#ifdef HAVE_TRACING + TRACE_end(); +#endif + XBT_DEBUG("Exiting Surf..."); surf_exit(); xbt_free(sd_global); sd_global = NULL; -#ifdef HAVE_TRACING - TRACE_end(); -#endif #ifdef HAVE_JEDULE jedule_sd_dump(); jedule_sd_cleanup();