only activate tests with raw contextes on platform where they are implemented

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

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index fd93d16..e5e48ce 100644 (file)
--- 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.
@@ -40,9 +40,22 @@ void SIMIX_context_mod_init(void)
       (*smx_factory_initializer_to_use)(&(simix_global->context_factory));
     }
     else { /* use the factory specified by --cfg=contexts/factory:value */
-      if (smx_context_factory_name == NULL || !strcmp(smx_context_factory_name, "ucontext")) {
+
+      if (smx_context_factory_name == NULL) {
+        /* use the default factory */
+#ifdef CONTEXT_UCONTEXT
+        SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
+#else
+        SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
+#endif
+      }
+      else if (!strcmp(smx_context_factory_name, "ucontext")) {
         /* use ucontext */
+#ifdef CONTEXT_UCONTEXT
         SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
+#else
+        xbt_die("The ontext factory 'ucontext' unavailable on your system");
+#endif
       }
       else if (!strcmp(smx_context_factory_name, "thread")) {
        /* use os threads (either pthreads or windows ones) */
@@ -86,7 +99,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;
 }