Revert "thread_local is C++11, remove the portability layer"

[simgrid.git] / src / simix / smx_context.cpp

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index a07051b..82a78fd 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -17,7 +17,7 @@
 #include "simgrid/modelchecker.h"
 
 
-#ifdef _XBT_WIN32
+#ifdef _WIN32
 #include <windows.h>
 #include <malloc.h>
 #else
@@ -29,12 +29,11 @@
 #define _aligned_free  __mingw_aligned_free 
 #endif //MINGW
 
-#ifdef HAVE_VALGRIND_VALGRIND_H
+#ifdef HAVE_VALGRIND_H
 # include <valgrind/valgrind.h>
 #endif
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
-                                "Context switching mechanism");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mechanism");
 
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
 int smx_context_stack_size;
@@ -101,7 +100,7 @@ void SIMIX_context_mod_init(void)
 #else
         XBT_ERROR("  (boost was disabled at compilation time on this machine -- check configure logs for details. Did you install the libboost-context-dev package?)");
 #endif
-        XBT_ERROR("  thread: slow portability layer using system threads (pthreads on UNIX, CreateThread() on windows)");
+        XBT_ERROR("  thread: slow portability layer using pthreads as provided by gcc");
         xbt_die("Please use a valid factory.");
       }
     }
@@ -115,7 +114,6 @@ void SIMIX_context_mod_exit(void)
 {
   delete simix_global->context_factory;
   simix_global->context_factory = nullptr;
-  xbt_dict_remove((xbt_dict_t) _sg_cfg_set,"contexts/factory");
 }
 
 void *SIMIX_context_stack_new(void)
@@ -128,30 +126,29 @@ void *SIMIX_context_stack_new(void)
 
   if (smx_context_guard_size > 0 && !MC_is_active()) {
 
-#if defined(_XBT_WIN32) || (PTH_STACKGROWTH != -1)
+#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 you're on Windows or PTH_STACKGROWTH != -1 (current value is %d).",
-               PTH_STACKGROWTH);
+      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;
     }
 #endif
 
     size_t size = smx_context_stack_size + smx_context_guard_size;
-#ifdef HAVE_MC
+#if HAVE_MC
     /* Cannot use posix_memalign when 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(_XBT_WIN32)
+#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 _XBT_WIN32
+#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
@@ -163,11 +160,9 @@ void *SIMIX_context_stack_new(void)
     stack = xbt_malloc0(smx_context_stack_size);
   }
 
-#ifdef HAVE_VALGRIND_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);
+#ifdef 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;
@@ -178,36 +173,30 @@ void SIMIX_context_stack_delete(void *stack)
   if (!stack)
     return;
 
-#ifdef HAVE_VALGRIND_VALGRIND_H
+#ifdef HAVE_VALGRIND_H
   unsigned int valgrind_stack_id;
-  memcpy(&valgrind_stack_id, (char *)stack + smx_context_usable_stack_size,
-         sizeof 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
+#ifndef _WIN32
   if (smx_context_guard_size > 0 && !MC_is_active()) {
     stack = (char *)stack - smx_context_guard_size;
-    if (mprotect(stack, smx_context_guard_size,
-                 PROT_READ | PROT_WRITE) == -1) {
+    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 */
     }
-#ifdef HAVE_MC
+#if HAVE_MC
     /* Retrieve the saved pointer.  See SIMIX_context_stack_new above. */
     stack = *((void **)stack - 1);
 #endif
   }
-#endif
+#endif /* not windows */
 
   xbt_free(stack);
 }
 
-/**
- * \brief Returns whether some parallel threads are used
- * for the user contexts.
- * \return 1 if parallelism is used
- */
+/** @brief Returns whether some parallel threads are used for the user contexts. */
 int SIMIX_context_is_parallel(void) {
   return smx_parallel_contexts > 1;
 }
@@ -236,12 +225,9 @@ void SIMIX_context_set_nthreads(int nb_threads) {
      nb_threads = xbt_os_get_numcores();
      XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
   }   
-  
-  if (nb_threads > 1) {
 #ifndef HAVE_THREAD_CONTEXTS
-    THROWF(arg_error, 0, "The thread factory cannot be run in parallel");
+  xbt_assert(nb_threads == 1, "Parallel runs are impossible when the pthreads are missing.");
 #endif
-  }
   smx_parallel_contexts = nb_threads;
 }