X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7b50ef668fe46e44363e4c7ea2089e37c6afec38..5f5a10db6fc4552782638abb4817041223e17775:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index fb1df9d4fc..5902d70865 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -20,7 +20,6 @@ #include "src/simgrid/module.hpp" #include "src/simgrid/sg_config.hpp" #include "src/smpi/include/smpi_config.hpp" -#include "src/xbt/mmalloc/mmalloc.h" #include @@ -31,9 +30,9 @@ static simgrid::config::Flag cfg_continue_after_help /** @brief Allow other libraries to react to the --help flag, too * - * When finding --help on the command line, simgrid usually stops right after displaying its help message. - * If you are writing a library using simgrid, you may want to display your own help message before everything stops. - * If so, just call this function before having simgrid parsing the command line, and you will be given the control + * When finding --help on the command line, SimGrid usually stops right after displaying its help message. + * If you are writing a library using SimGrid, you may want to display your own help message before everything stops. + * If so, just call this function before having SimGrid parsing the command line, and you will be given the control * even if the user is asking for help. */ void sg_config_continue_after_help() @@ -202,15 +201,8 @@ void sg_config_init(int *argc, char **argv) [](int value) { simgrid::kernel::context::Context::guard_size = value * xbt_pagesize; }}; static simgrid::config::Flag cfg_context_nthreads{ - "contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, [](int nthreads) { -#if HAVE_MMALLOC - xbt_assert( - nthreads == 1 || not malloc_use_mmalloc(), - "Parallel simulation is forbidden in the verified program, as there is no protection against race " - "conditions in mmalloc itself. Please don't be so greedy and show some mercy for our implementation."); -#endif - simgrid::kernel::context::Context::set_nthreads(nthreads); - }}; + "contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, + [](int nthreads) { simgrid::kernel::context::Context::set_nthreads(nthreads); }}; /* synchronization mode for parallel user contexts */ #if HAVE_FUTEX_H