X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7d939c32e832e22e45b44ec1bc21999d64c5554..3d489fd0ea1a24796b898737fdd6a67a8b7bedab:/src/simdag/sd_global.cpp diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index f6fb1dcd66..8aeb02a1af 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -4,17 +4,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "instr/instr_interface.h" #include "simgrid/sg_config.h" #include "simgrid/host.h" #include "src/simdag/simdag_private.h" #include "src/surf/surf_interface.hpp" #include "simgrid/s4u/engine.hpp" -#if HAVE_JEDULE -#include "simgrid/jedule/jedule_sd_binding.h" -#endif - XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)"); @@ -36,8 +31,6 @@ void SD_init(int *argc, char **argv) sd_global = xbt_new(s_SD_global_t, 1); sd_global->watch_point_reached = false; - sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f, SD_task_free_f, SD_task_recycle_f); - sd_global->initial_tasks = new std::set(); sd_global->runnable_tasks = new std::set(); sd_global->completed_tasks = new std::set(); @@ -227,14 +220,11 @@ double SD_get_clock() { */ void SD_exit() { - TRACE_surf_resource_utilization_release(); - #if HAVE_JEDULE jedule_sd_cleanup(); jedule_sd_exit(); #endif - xbt_mallocator_free(sd_global->task_mallocator); delete sd_global->initial_tasks; delete sd_global->runnable_tasks; delete sd_global->completed_tasks;