X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec16845133f5f1b5262d2d77d8ba22824fa8a446..9d873cd12522bb6334ee3acff89384c03645f00d:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 810f7fb5f9..e5e48ce071 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -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,7 @@ 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