X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/simix/smx_context.cpp diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index 6b0c54b944..d07d747b97 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -1,28 +1,16 @@ /* a fast and simple context switching library */ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ /* 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 -#include - -#include -#include - -#include -#include -#include -#include - #include "simgrid/modelchecker.h" -#include "simgrid/sg_config.h" -#include "smx_private.hpp" #include "src/internal_config.h" -#include "xbt/log.h" -#include "xbt/swag.h" -#include "xbt/xbt_os_thread.h" +#include "src/simix/smx_private.hpp" +#include "xbt/config.hpp" + +#include #ifdef _WIN32 #include @@ -81,11 +69,7 @@ unsigned smx_context_stack_size; int smx_context_stack_size_was_set = 0; unsigned smx_context_guard_size; int smx_context_guard_size_was_set = 0; -#if HAVE_THREAD_LOCAL_STORAGE -static XBT_THREAD_LOCAL smx_context_t smx_current_context_parallel; -#else -static xbt_os_thread_key_t smx_current_context_key = 0; -#endif +static thread_local smx_context_t smx_current_context_parallel; static smx_context_t smx_current_context_serial; static int smx_parallel_contexts = 1; static int smx_parallel_threshold = 2; @@ -98,21 +82,19 @@ void SIMIX_context_mod_init() { xbt_assert(simix_global->context_factory == nullptr); -#if HAVE_THREAD_CONTEXTS && not HAVE_THREAD_LOCAL_STORAGE - /* the __thread storage class is not available on this platform: - * use getspecific/setspecific instead to store the current context in each thread */ - xbt_os_thread_key_create(&smx_current_context_key); -#endif + smx_context_stack_size_was_set = not simgrid::config::is_default("contexts/stack-size"); + smx_context_guard_size_was_set = not simgrid::config::is_default("contexts/guard-size"); -#if defined(__APPLE__) || defined(__NetBSD__) - if (context_factory_name == std::string("thread") && - strcmp(xbt_cfg_get_string("smpi/privatization"), "dlopen") == 0) { +#if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__)) + std::string priv = simgrid::config::get_value("smpi/privatization"); + if (context_factory_name == "thread" && (priv == "dlopen" || priv == "yes" || priv == "default" || priv == "1")) { XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts."); context_factory_name = "raw"; } #endif -#if defined(__FreeBSD__) - if (context_factory_name == std::string("thread") && strcmp(xbt_cfg_get_string("smpi/privatization"), "no") != 0) { + +#if HAVE_SMPI && defined(__FreeBSD__) + if (context_factory_name == "thread" && simgrid::config::get_value("smpi/privatization") != "no") { XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts."); context_factory_name = "raw"; } @@ -165,18 +147,14 @@ void *SIMIX_context_stack_new() { void *stack; - /* FIXME: current code for stack overflow protection assumes that stacks are - * growing downward (PTH_STACKGROWTH == -1). Protected pages need to be put - * after the stack when PTH_STACKGROWTH == 1. */ - if (smx_context_guard_size > 0 && not MC_is_active()) { #if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -1) - static int warned_once = 0; - if (not warned_once) { - XBT_WARN("Stack overflow protection is known to be broken on your system. Either stack grows upwards, or it was not even tested properly."); - warned_once = 1; - } + xbt_die("Stack overflow protection is known to be broken on your system: you stacks grow upwards (or detection is " + "broken). " + "Please disable stack guards with --cfg=contexts:guard-size:0"); + /* Current code for stack overflow protection assumes that stacks are growing downward (PTH_STACKGROWTH == -1). + * Protected pages need to be put after the stack when PTH_STACKGROWTH == 1. */ #endif size_t size = smx_context_stack_size + smx_context_guard_size; @@ -252,26 +230,26 @@ int SIMIX_context_is_parallel() { /** * @brief Returns the number of parallel threads used for the user contexts. - * \return the number of threads (1 means no parallelism) + * @return the number of threads (1 means no parallelism) */ int SIMIX_context_get_nthreads() { return smx_parallel_contexts; } /** - * \brief Sets the number of parallel threads to use + * @brief Sets the number of parallel threads to use * for the user contexts. * * This function should be called before initializing SIMIX. * A value of 1 means no parallelism (1 thread only). * If the value is greater than 1, the thread support must be enabled. * - * \param nb_threads the number of threads to use + * @param nb_threads the number of threads to use */ void SIMIX_context_set_nthreads(int nb_threads) { if (nb_threads<=0) { - nb_threads = xbt_os_get_numcores(); - XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads); + nb_threads = std::thread::hardware_concurrency(); + XBT_INFO("Auto-setting contexts/nthreads to %d", nb_threads); } #if !HAVE_THREAD_CONTEXTS xbt_assert(nb_threads == 1, "Parallel runs are impossible when the pthreads are missing."); @@ -280,12 +258,12 @@ void SIMIX_context_set_nthreads(int nb_threads) { } /** - * \brief Returns the threshold above which user processes are run in parallel. + * @brief Returns the threshold above which user processes are run in parallel. * * If the number of threads is set to 1, there is no parallelism and this * threshold has no effect. * - * \return when the number of user processes ready to run is above + * @return when the number of user processes ready to run is above * this threshold, they are run in parallel */ int SIMIX_context_get_parallel_threshold() { @@ -293,12 +271,12 @@ int SIMIX_context_get_parallel_threshold() { } /** - * \brief Sets the threshold above which user processes are run in parallel. + * @brief Sets the threshold above which user processes are run in parallel. * * If the number of threads is set to 1, there is no parallelism and this * threshold has no effect. * - * \param threshold when the number of user processes ready to run is above + * @param threshold when the number of user processes ready to run is above * this threshold, they are run in parallel */ void SIMIX_context_set_parallel_threshold(int threshold) { @@ -306,35 +284,31 @@ void SIMIX_context_set_parallel_threshold(int threshold) { } /** - * \brief Returns the synchronization mode used when processes are run in + * @brief Returns the synchronization mode used when processes are run in * parallel. - * \return how threads are synchronized if processes are run in parallel + * @return how threads are synchronized if processes are run in parallel */ e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode() { return smx_parallel_synchronization_mode; } /** - * \brief Sets the synchronization mode to use when processes are run in + * @brief Sets the synchronization mode to use when processes are run in * parallel. - * \param mode how to synchronize threads if processes are run in parallel + * @param mode how to synchronize threads if processes are run in parallel */ void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) { smx_parallel_synchronization_mode = mode; } /** - * \brief Returns the current context of this thread. - * \return the current context of this thread + * @brief Returns the current context of this thread. + * @return the current context of this thread */ smx_context_t SIMIX_context_get_current() { if (SIMIX_context_is_parallel()) { -#if HAVE_THREAD_LOCAL_STORAGE return smx_current_context_parallel; -#else - return xbt_os_thread_get_specific(smx_current_context_key); -#endif } else { return smx_current_context_serial; @@ -342,17 +316,13 @@ smx_context_t SIMIX_context_get_current() } /** - * \brief Sets the current context of this thread. - * \param context the context to set + * @brief Sets the current context of this thread. + * @param context the context to set */ void SIMIX_context_set_current(smx_context_t context) { if (SIMIX_context_is_parallel()) { -#if HAVE_THREAD_LOCAL_STORAGE smx_current_context_parallel = context; -#else - xbt_os_thread_set_specific(smx_current_context_key, context); -#endif } else { smx_current_context_serial = context;