X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b686073e4e6991ea9ae4154a13bf693acd738551..3b4740f2c34e232bcf203b9407af5637acaecaec:/src/simix/smx_context.cpp

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 148f66ea42..712ab9cfaa 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-2017. 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. */
@@ -97,7 +96,7 @@ static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAUL
 /**
  * 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);
 
@@ -107,6 +106,20 @@ void SIMIX_context_mod_init(void)
   xbt_os_thread_key_create(&smx_current_context_key);
 #endif
 
+#if defined(__APPLE__) || defined(__NetBSD__)
+  if (context_factory_name == std::string("thread") &&
+      strcmp(xbt_cfg_get_string("smpi/privatization"), "dlopen") == 0) {
+    XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts.");
+    context_factory_name = "raw";
+  }
+#endif
+#if defined(__FreeBSD__)
+  if (context_factory_name == std::string("thread") && strcmp(xbt_cfg_get_string("smpi/privatization"), "no") != 0) {
+    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();
@@ -144,13 +157,13 @@ void SIMIX_context_mod_init(void)
 /**
  * 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;
 
@@ -169,8 +182,8 @@ void *SIMIX_context_stack_new(void)
 #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;
@@ -184,9 +197,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;
@@ -220,7 +237,7 @@ void SIMIX_context_stack_delete(void *stack)
       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
@@ -231,7 +248,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;
 }
 
@@ -239,7 +256,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;
 }
 
@@ -273,7 +290,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;
 }
 
@@ -295,7 +312,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;
 }
 
@@ -312,7 +329,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