X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/33d53861f6312ae42985bdc7011c396761125c3d..61545150384cb45f61766f4864b204b94ad2b0dc:/src/simix/smx_context.c diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c index 9273ab1381..0ce478fe81 100644 --- a/src/simix/smx_context.c +++ b/src/simix/smx_context.c @@ -19,7 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */ smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL; int smx_context_stack_size = 128 * 1024; - +int smx_context_stack_size_was_set = 0; #ifdef HAVE_THREAD_LOCAL_STORAGE static __thread smx_context_t smx_current_context_parallel; #else @@ -44,13 +44,13 @@ void SIMIX_context_mod_init(void) if (smx_context_factory_name == NULL) { /* use the default factory */ - #ifdef HAVE_RAWCTX - SIMIX_ctx_raw_factory_init(&simix_global->context_factory); - #elif CONTEXT_UCONTEXT - SIMIX_ctx_sysv_factory_init(&simix_global->context_factory); - #else - SIMIX_ctx_thread_factory_init(&simix_global->context_factory); - #endif + #ifdef HAVE_RAWCTX + SIMIX_ctx_raw_factory_init(&simix_global->context_factory); + #elif 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 */ @@ -61,12 +61,12 @@ void SIMIX_context_mod_init(void) #endif } else if (!strcmp(smx_context_factory_name, "thread")) { - /* use os threads (either pthreads or windows ones) */ + /* use os threads (either pthreads or windows ones) */ SIMIX_ctx_thread_factory_init(&simix_global->context_factory); } else if (!strcmp(smx_context_factory_name, "raw")) { - /* use raw contexts */ - SIMIX_ctx_raw_factory_init(&simix_global->context_factory); + /* use raw contexts */ + SIMIX_ctx_raw_factory_init(&simix_global->context_factory); } else { XBT_ERROR("Invalid context factory specified. Valid factories on this machine:"); @@ -138,11 +138,11 @@ XBT_INLINE int SIMIX_context_get_nthreads(void) { */ XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads) { - if (nb_threads<=0) { + if (nb_threads<=0) { nb_threads = xbt_os_get_numcores(); XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads); } - + if (nb_threads > 1) { #ifndef CONTEXT_THREADS THROWF(arg_error, 0, "The thread factory cannot be run in parallel");