X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8eb62b207b566949a0d9ce649a7b21e226b9168..e816186fdeaf53fa5abf6886f157c499e09c4622:/src/simix/smx_context.cpp diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index bd4a7e3a1e..533669351a 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -1,43 +1,14 @@ /* a fast and simple context switching library */ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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 "src/simix/smx_private.hpp" +#include "xbt/config.hpp" -#include -#include - -#include -#include -#include -#include - -#include "simgrid/modelchecker.h" -#include "simgrid/sg_config.hpp" -#include "smx_private.hpp" -#include "src/internal_config.h" -#include "xbt/log.h" -#include "xbt/xbt_os_thread.h" - -#ifdef _WIN32 -#include -#include -#else -#include -#endif - -#ifdef __MINGW32__ -#define _aligned_malloc __mingw_aligned_malloc -#define _aligned_free __mingw_aligned_free -#endif /*MINGW*/ - -#if HAVE_VALGRIND_H -# include -#endif +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mechanism"); @@ -51,9 +22,7 @@ static std::pair context_factory_name( context_factories[0].first); 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 smx_context_t smx_current_context_serial; 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; @@ -97,15 +58,6 @@ void SIMIX_context_mod_init() { xbt_assert(simix_global->context_factory == nullptr); - 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 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 - #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")) { @@ -122,7 +74,7 @@ void SIMIX_context_mod_init() #endif /* select the context factory to use to create the contexts */ - if (simgrid::kernel::context::factory_initializer) { // Give Java a chance to hijack the factory mechanism + if (simgrid::kernel::context::factory_initializer != nullptr) { // Give Java a chance to hijack the factory mechanism simix_global->context_factory = simgrid::kernel::context::factory_initializer(); return; } @@ -164,86 +116,6 @@ void SIMIX_context_mod_exit() simix_global->context_factory = nullptr; } -void *SIMIX_context_stack_new() -{ - void *stack; - - if (smx_context_guard_size > 0 && not MC_is_active()) { - -#if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -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; -#if SIMGRID_HAVE_MC - /* Cannot use posix_memalign when SIMGRID_HAVE_MC. Align stack by hand, and save the - * pointer returned by xbt_malloc0. */ - char *alloc = (char*)xbt_malloc0(size + xbt_pagesize); - stack = alloc - ((uintptr_t)alloc & (xbt_pagesize - 1)) + xbt_pagesize; - *((void **)stack - 1) = alloc; -#elif !defined(_WIN32) - if (posix_memalign(&stack, xbt_pagesize, size) != 0) - xbt_die("Failed to allocate stack."); -#else - stack = _aligned_malloc(size, xbt_pagesize); -#endif - -#ifndef _WIN32 - if (mprotect(stack, smx_context_guard_size, PROT_NONE) == -1) { - 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; - } else { - stack = xbt_malloc0(smx_context_stack_size); - } - -#if HAVE_VALGRIND_H - unsigned int valgrind_stack_id = VALGRIND_STACK_REGISTER(stack, (char *)stack + smx_context_stack_size); - memcpy((char *)stack + smx_context_usable_stack_size, &valgrind_stack_id, sizeof valgrind_stack_id); -#endif - - return stack; -} - -void SIMIX_context_stack_delete(void *stack) -{ - if (not stack) - return; - -#if HAVE_VALGRIND_H - unsigned int valgrind_stack_id; - memcpy(&valgrind_stack_id, (char *)stack + smx_context_usable_stack_size, sizeof valgrind_stack_id); - VALGRIND_STACK_DEREGISTER(valgrind_stack_id); -#endif - -#ifndef _WIN32 - if (smx_context_guard_size > 0 && not MC_is_active()) { - stack = (char *)stack - smx_context_guard_size; - if (mprotect(stack, smx_context_guard_size, PROT_READ | PROT_WRITE) == -1) { - XBT_WARN("Failed to remove page protection: %s", strerror(errno)); - /* try to pursue anyway */ - } -#if SIMGRID_HAVE_MC - /* Retrieve the saved pointer. See SIMIX_context_stack_new above. */ - stack = *((void **)stack - 1); -#endif - } -#endif /* not windows */ - - xbt_free(stack); -} - /** @brief Returns whether some parallel threads are used for the user contexts. */ int SIMIX_context_is_parallel() { return smx_parallel_contexts > 1; @@ -269,12 +141,9 @@ int SIMIX_context_get_nthreads() { */ 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."); -#endif smx_parallel_contexts = nb_threads; } @@ -321,39 +190,3 @@ e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode() { 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 - */ -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; - } -} - -/** - * @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; - } -}