X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eacfab6c97ff6a65f91ebbea136b732259d7667e..6a740731c81fb23ebbb5791f61dacb02c751bcc4:/src/simix/smx_context.cpp diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index 31d2aa2ffb..d0343ddcfc 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -1,12 +1,13 @@ /* a fast and simple context switching library */ -/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. 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 "src/internal_config.h" #include "src/simix/smx_private.hpp" +#include "smpi/smpi.h" #include "xbt/config.hpp" #include @@ -60,6 +61,7 @@ void SIMIX_context_mod_init() xbt_assert(simix_global->context_factory == nullptr); #if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__)) + smpi_init_options(); 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."); @@ -68,6 +70,7 @@ void SIMIX_context_mod_init() #endif #if HAVE_SMPI && defined(__FreeBSD__) + smpi_init_options(); 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";