From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 18 Sep 2018 16:18:33 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_21~80
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/353e4c084db3c0a55663e4121ca20112b44de6d4?hp=9bf83aee236cf9e699ba2d823f037ee6983cb4af

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/examples/s4u/platform-failures/s4u-platform-failures.cpp b/examples/s4u/platform-failures/s4u-platform-failures.cpp
index c7a6378936..f52f8d627c 100644
--- a/examples/s4u/platform-failures/s4u-platform-failures.cpp
+++ b/examples/s4u/platform-failures/s4u-platform-failures.cpp
@@ -86,8 +86,8 @@ static int worker(int argc, char* argv[])
     try {
       XBT_INFO("Waiting a message on %s", mailbox->get_cname());
       payload   = static_cast<double*>(mailbox->get());
-      comp_size = *payload;
       xbt_assert(payload != nullptr, "mailbox->get() failed");
+      comp_size = *payload;
       if (comp_size < 0) { /* - Exit when -1.0 is received */
         XBT_INFO("I'm done. See you!");
         delete payload;
diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index aaef32d548..4e218d11e4 100644
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -53,14 +53,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke
   extern "C" void _gfortran_set_args(int, char **);
 #endif
 
-#ifndef RTLD_DEEPBIND
-/* RTLD_DEEPBIND is a bad idea of GNU ld that obviously does not exist on other platforms
- * See https://www.akkadia.org/drepper/dsohowto.pdf
- * and https://lists.freebsd.org/pipermail/freebsd-current/2016-March/060284.html
-*/
-#define RTLD_DEEPBIND 0
-#endif
-
 #if HAVE_PAPI
 #include "papi.h"
 std::string papi_default_config_name = "default";
@@ -610,7 +602,7 @@ static void smpi_init_privatization_dlopen(std::string executable)
 
       rank++;
       // Load the copy and resolve the entry point:
-      void* handle    = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND);
+      void* handle    = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL);
       int saved_errno = errno;
       if (simgrid::config::get_value<bool>("smpi/keep-temps") == false) {
         unlink(target_executable.c_str());
diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh
index 3608d24294..29d89cb0a7 100755
--- a/tools/jenkins/Sanitizers.sh
+++ b/tools/jenkins/Sanitizers.sh
@@ -33,7 +33,6 @@ elif [ "${SANITIZER}" = "thread" ]
 then
     export TSAN_OPTIONS="memory_limit_mb=1500"
     SANITIZER_OPTIONS="-Denable_address_sanitizer=OFF -Denable_undefined_sanitizer=OFF -Denable_thread_sanitizer=ON"
-    export SMPI_PRIVATIZATION="mmap" # TSAN don't play well with dlopen
 elif [ "${SANITIZER}" = "undefined" ]
 then
     export UBSAN_OPTIONS="print_stacktrace=1"