X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/125ba3dea38f9b31330b322f9bc59fdd428821ae..ada64beec413781e8e11cc6106c5411962cac0fb:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index fd93d1604f..9a526f53ae 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -27,7 +27,7 @@ smx_context_t smx_current_context;
 #endif
 
 static int smx_parallel_contexts = 1;
-static int smx_parallel_threshold = 20;
+static int smx_parallel_threshold = 1;
 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.
@@ -86,7 +86,14 @@ void SIMIX_context_mod_exit(void)
  */
 XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads) {
 
-  xbt_assert1(nb_threads > 0, "Invalid number of parallel threads: %d", nb_threads);
+  xbt_assert(nb_threads > 0, "Invalid number of parallel threads: %d", nb_threads);
+
+  if (nb_threads > 1) {
+#ifndef CONTEXT_THREADS
+    THROWF(arg_error, 0, "No thread support for parallel context execution");
+#endif
+  }
+
   smx_parallel_contexts = nb_threads;
 }