From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 7 Mar 2016 09:03:05 +0000 (+0100)
Subject: Merge branch 'master' of github.com:mquinson/simgrid
X-Git-Tag: v3_13~500^2~7
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5e7ea743f4e41c8fb6e0c1cce87df1ff8804a82a?hp=6bc71102f9c6ad0e9bb98c6a8c08f3556b636d3d

Merge branch 'master' of github.com:mquinson/simgrid
---

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index a75367fefd..4362848d2f 100644
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -126,7 +126,7 @@ void *SIMIX_context_stack_new(void)
 
   if (smx_context_guard_size > 0 && !MC_is_active()) {
 
-#if defined(_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).",
@@ -226,12 +226,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;
 }