X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/907e0ad42ebe9ac4074648201519ecc10d1f8812..664906a2f0058fcf83456ff2f4e7a3dbf97d4afe:/src/simix/smx_context.c diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c index 281c2d886f..857c049502 100644 --- a/src/simix/smx_context.c +++ b/src/simix/smx_context.c @@ -10,7 +10,7 @@ #include "xbt/log.h" #include "xbt/swag.h" #include "private.h" -#include "simix/smx_context_private.h" +#include "simix/context.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mecanism"); @@ -26,11 +26,12 @@ void SIMIX_context_mod_init(void) /* select context factory to use to create the context(depends of the macro definitions) */ if (factory_initializer_to_use) { (*factory_initializer_to_use)(&(simix_global->context_factory)); - } else { -#ifdef CONTEXT_THREADS /* Use os threads (either pthreads or windows ones) */ - SIMIX_ctx_thread_factory_init(&simix_global->context_factory); -#elif defined(CONTEXT_UCONTEXT) /* use ucontext */ + } + else { +#ifdef CONTEXT_UCONTEXT /* use ucontext */ SIMIX_ctx_sysv_factory_init(&simix_global->context_factory); +#elif defined(CONTEXT_THREADS) /* Use os threads (either pthreads or windows ones) */ + SIMIX_ctx_thread_factory_init(&simix_global->context_factory); #else #error ERROR [__FILE__, line __LINE__]: no context implementation specified. #endif