X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4ab179f11ae2afec1467c4ca9256fc5ba6fa85b..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/simix/smx_context.cpp diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index 2edefd4031..55bb5e8970 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -1,7 +1,6 @@ /* a fast and simple context switching library */ -/* Copyright (c) 2009-2015. 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. */ @@ -17,15 +16,12 @@ #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/swag.h" #include "xbt/xbt_os_thread.h" -#include "smx_private.h" -#include "simgrid/sg_config.h" -#include "src/internal_config.h" -#include "simgrid/modelchecker.h" - #ifdef _WIN32 #include @@ -34,10 +30,10 @@ #include #endif -#ifdef __MINGW32__ -#define _aligned_malloc __mingw_aligned_malloc -#define _aligned_free __mingw_aligned_free -#endif //MINGW +#ifdef __MINGW32__ +#define _aligned_malloc __mingw_aligned_malloc +#define _aligned_free __mingw_aligned_free +#endif /*MINGW*/ #if HAVE_VALGRIND_H # include @@ -80,9 +76,9 @@ static simgrid::config::Flag context_factory_name( (std::string("Possible values: ")+contexts_list()).c_str(), context_factories[0].first); -int smx_context_stack_size; +unsigned smx_context_stack_size; int smx_context_stack_size_was_set = 0; -int smx_context_guard_size; +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; @@ -101,12 +97,30 @@ void SIMIX_context_mod_init() { xbt_assert(simix_global->context_factory == nullptr); -#if HAVE_THREAD_CONTEXTS && !HAVE_THREAD_LOCAL_STORAGE + 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")) { + XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts."); + context_factory_name = "raw"; + } +#endif + +#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"; + } +#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 simix_global->context_factory = simgrid::kernel::context::factory_initializer(); @@ -154,23 +168,19 @@ 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 && !MC_is_active()) { + if (smx_context_guard_size > 0 && not MC_is_active()) { #if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -1) - static int warned_once = 0; - if (!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; -#if HAVE_MC - /* Cannot use posix_memalign when HAVE_MC. Align stack by hand, and save the +#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; @@ -208,7 +218,7 @@ void *SIMIX_context_stack_new() void SIMIX_context_stack_delete(void *stack) { - if (!stack) + if (not stack) return; #if HAVE_VALGRIND_H @@ -218,13 +228,13 @@ void SIMIX_context_stack_delete(void *stack) #endif #ifndef _WIN32 - if (smx_context_guard_size > 0 && !MC_is_active()) { + 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 HAVE_MC +#if SIMGRID_HAVE_MC /* Retrieve the saved pointer. See SIMIX_context_stack_new above. */ stack = *((void **)stack - 1); #endif @@ -258,10 +268,10 @@ int SIMIX_context_get_nthreads() { * \param nb_threads the number of threads to use */ void SIMIX_context_set_nthreads(int nb_threads) { - if (nb_threads<=0) { + if (nb_threads<=0) { nb_threads = xbt_os_get_numcores(); 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