X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/401ba15e5e4da730ac3239424534c28fa51eda02..a4ab179f11ae2afec1467c4ca9256fc5ba6fa85b:/src/simix/smx_context.cpp diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index f8c7e74473..2edefd4031 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -45,23 +45,22 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mechanism"); -static std::pair context_factories[] = { +static std::pair context_factories[] = { #if HAVE_RAW_CONTEXTS - { "raw", &simgrid::simix::raw_factory }, + { "raw", &simgrid::kernel::context::raw_factory }, #endif #if HAVE_UCONTEXT_CONTEXTS - { "ucontext", &simgrid::simix::sysv_factory }, + { "ucontext", &simgrid::kernel::context::sysv_factory }, #endif #if HAVE_BOOST_CONTEXTS - { "boost", &simgrid::simix::boost_factory }, + { "boost", &simgrid::kernel::context::boost_factory }, #endif #if HAVE_THREAD_CONTEXTS - { "thread", &simgrid::simix::thread_factory }, + { "thread", &simgrid::kernel::context::thread_factory }, #endif }; -static_assert(sizeof(context_factories) != 0, - "No context factories are enabled for this build"); +static_assert(sizeof(context_factories) != 0, "No context factories are enabled for this build"); // Create the list of possible contexts: static inline @@ -95,44 +94,22 @@ static int smx_parallel_contexts = 1; static int smx_parallel_threshold = 2; static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAULT; -static inline -void invalid_context_factory() -{ - XBT_ERROR("Invalid context factory specified. Valid factories on this machine:"); -#if HAVE_RAW_CONTEXTS - XBT_ERROR(" raw: high performance context factory implemented specifically for SimGrid"); -#else - XBT_ERROR(" (raw contexts were disabled at compilation time on this machine -- check configure logs for details)"); -#endif -#if HAVE_UCONTEXT_CONTEXTS - XBT_ERROR(" ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)"); -#else - XBT_ERROR(" (ucontext was disabled at compilation time on this machine -- check configure logs for details)"); -#endif -#if HAVE_BOOST_CONTEXTS - XBT_ERROR(" boost: this uses the boost libraries context implementation"); -#else - XBT_ERROR(" (boost was disabled at compilation time on this machine -- check configure logs for details. Did you install the libboost-context-dev package?)"); -#endif - XBT_ERROR(" thread: slow portability layer using pthreads as provided by gcc"); - xbt_die("Please use a valid factory."); -} - /** * This function is called by SIMIX_global_init() to initialize the context module. */ -void SIMIX_context_mod_init(void) +void SIMIX_context_mod_init() { + xbt_assert(simix_global->context_factory == nullptr); + #if HAVE_THREAD_CONTEXTS && !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 - if (simix_global->context_factory) - return; + /* select the context factory to use to create the contexts */ - if (simgrid::simix::factory_initializer) { // Give Java a chance to hijack the factory mechanism - simix_global->context_factory = simgrid::simix::factory_initializer(); + if (simgrid::kernel::context::factory_initializer) { // Give Java a chance to hijack the factory mechanism + simix_global->context_factory = simgrid::kernel::context::factory_initializer(); return; } /* use the factory specified by --cfg=contexts/factory:value */ @@ -141,20 +118,39 @@ void SIMIX_context_mod_init(void) simix_global->context_factory = factory.second(); break; } - if (simix_global->context_factory == nullptr) - invalid_context_factory(); + + if (simix_global->context_factory == nullptr) { + XBT_ERROR("Invalid context factory specified. Valid factories on this machine:"); +#if HAVE_RAW_CONTEXTS + XBT_ERROR(" raw: high performance context factory implemented specifically for SimGrid"); +#else + XBT_ERROR(" (raw contexts were disabled at compilation time on this machine -- check configure logs for details)"); +#endif +#if HAVE_UCONTEXT_CONTEXTS + XBT_ERROR(" ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)"); +#else + XBT_ERROR(" (ucontext was disabled at compilation time on this machine -- check configure logs for details)"); +#endif +#if HAVE_BOOST_CONTEXTS + XBT_ERROR(" boost: this uses the boost libraries context implementation"); +#else + XBT_ERROR(" (boost was disabled at compilation time on this machine -- check configure logs for details. Did you install the libboost-context-dev package?)"); +#endif + XBT_ERROR(" thread: slow portability layer using pthreads as provided by gcc"); + xbt_die("Please use a valid factory."); + } } /** * This function is called by SIMIX_clean() to finalize the context module. */ -void SIMIX_context_mod_exit(void) +void SIMIX_context_mod_exit() { delete simix_global->context_factory; simix_global->context_factory = nullptr; } -void *SIMIX_context_stack_new(void) +void *SIMIX_context_stack_new() { void *stack; @@ -188,9 +184,13 @@ void *SIMIX_context_stack_new(void) #ifndef _WIN32 if (mprotect(stack, smx_context_guard_size, PROT_NONE) == -1) { - xbt_die("Failed to protect stack: %s", strerror(errno)); - /* This is fatal. We are going to fail at some point when - we tryi reusing this. */ + xbt_die( + "Failed to protect stack: %s.\n" + "If you are running a lot of actors, you may be exceeding the amount of mappings allowed per process.\n" + "On Linux systems, change this value with sudo sysctl -w vm.max_map_count=newvalue (default value: 65536)\n" + "Please see http://simgrid.gforge.inria.fr/simgrid/latest/doc/html/options.html#options_virt for more info.", + strerror(errno)); + /* This is fatal. We are going to fail at some point when we try reusing this. */ } #endif stack = (char *)stack + smx_context_guard_size; @@ -235,7 +235,7 @@ void SIMIX_context_stack_delete(void *stack) } /** @brief Returns whether some parallel threads are used for the user contexts. */ -int SIMIX_context_is_parallel(void) { +int SIMIX_context_is_parallel() { return smx_parallel_contexts > 1; } @@ -243,7 +243,7 @@ int SIMIX_context_is_parallel(void) { * @brief Returns the number of parallel threads used for the user contexts. * \return the number of threads (1 means no parallelism) */ -int SIMIX_context_get_nthreads(void) { +int SIMIX_context_get_nthreads() { return smx_parallel_contexts; } @@ -277,7 +277,7 @@ void SIMIX_context_set_nthreads(int nb_threads) { * \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(void) { +int SIMIX_context_get_parallel_threshold() { return smx_parallel_threshold; } @@ -299,7 +299,7 @@ void SIMIX_context_set_parallel_threshold(int threshold) { * parallel. * \return how threads are synchronized if processes are run in parallel */ -e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode(void) { +e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode() { return smx_parallel_synchronization_mode; } @@ -316,7 +316,7 @@ void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) { * \brief Returns the current context of this thread. * \return the current context of this thread */ -smx_context_t SIMIX_context_get_current(void) +smx_context_t SIMIX_context_get_current() { if (SIMIX_context_is_parallel()) { #if HAVE_THREAD_LOCAL_STORAGE