X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa4388c7780ebcbc130f17b5e473f4d356ec567f..dfb3c1f1d5dc90a8162071e4db743abef05ca521:/src/simix/smx_context.c diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c index 3b42c8203f..ee5c9ffcc5 100644 --- a/src/simix/smx_context.c +++ b/src/simix/smx_context.c @@ -10,17 +10,16 @@ #include "xbt/log.h" #include "xbt/swag.h" #include "private.h" - -#ifdef HAVE_LUA -#include -#endif +#include "simix/context.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mecanism"); -const char *xbt_ctx_factory_to_use = NULL; -typedef void (*SIMIX_ctx_factory_initializer_t)(smx_context_factory_t *); -SIMIX_ctx_factory_initializer_t factory_initializer_to_use = NULL; +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; +smx_context_t smx_current_context; +static int smx_parallel_contexts = 1; /** * This function is called by SIMIX_global_init() to initialize the context module. @@ -28,22 +27,26 @@ SIMIX_ctx_factory_initializer_t factory_initializer_to_use = NULL; void SIMIX_context_mod_init(void) { if (!simix_global->context_factory) { - /* 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 - /* context switch based os thread */ - SIMIX_ctx_thread_factory_init(&simix_global->context_factory); -#elif defined(CONTEXT_UCONTEXT) - /* context switch based ucontext */ - SIMIX_ctx_sysv_factory_init(&simix_global->context_factory); -#elif defined(_XBT_WIN32) - /* context switch based windows */ -#else - /* context switch is not allowed on Windows */ -#error ERROR [__FILE__, line __LINE__]: no context based implementation specified. -#endif + /* select the context factory to use to create the contexts */ + if (smx_factory_initializer_to_use) { + (*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")) { + /* use ucontext */ + SIMIX_ctx_sysv_factory_init(&simix_global->context_factory); + } + else if (!strcmp(smx_context_factory_name, "thread")) { + /* 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); + } + else { + xbt_die("Invalid context factory specified"); + } } } } @@ -60,79 +63,40 @@ void SIMIX_context_mod_exit(void) finalize_factory = simix_global->context_factory->finalize; (*finalize_factory) (&simix_global->context_factory); } + xbt_dict_remove((xbt_dict_t) _surf_cfg_set,"contexts/factory"); } /** - * This function is used to change the context factory. - * Warning: it destroy all the existing processes (even for maestro), and it - * will create a new maestro process using the new context factory. + * \brief Sets the number of parallel threads to use + * for the user contexts. + * + * This function should be called before initializing SIMIX. + * A value of 1 means no parallelism. + * If the value is greater than 1, the thread support must be enabled. + * + * \param nb_threads the number of threads to use */ -int SIMIX_context_select_factory(const char *name) -{ - /* if a context factory is already instantiated and it is different from the - newly selected one, then kill all the processes, exit the context module - and initialize the new factory. - */ - - - if (simix_global->context_factory != NULL) { - if (strcmp(simix_global->context_factory->name, name)) { - - SIMIX_process_killall(); - - /* kill maestro process */ - SIMIX_context_free(simix_global->maestro_process->context); - free(simix_global->maestro_process); - simix_global->maestro_process = NULL; - - SIMIX_context_mod_exit(); - } else - /* the same context factory is requested return directly */ - return 0; - } - - /* init the desired factory */ - smx_context_factory_t * factory = &simix_global->context_factory; - if (!strcmp(name, "java")) -#ifdef HAVE_JAVA - SIMIX_ctx_java_factory_init(factory); -#else - THROW0(not_found_error, 0, - "Factory 'Java' does not exist: Java support was not compiled in the SimGrid library"); -#endif /* HAVE_JAVA */ - - else if (!strcmp(name, "thread")) -#ifdef CONTEXT_THREADS - SIMIX_ctx_thread_factory_init(factory); -#else - THROW0(not_found_error, 0, - "Factory 'thread' does not exist: thread support was not compiled in the SimGrid library"); -#endif /* CONTEXT_THREADS */ - - else if (!strcmp(name, "sysv")) -#if !defined(_XBT_WIN32) && !defined(CONTEXT_THREADS) - SIMIX_ctx_sysv_factory_init(factory); -#else - THROW0(not_found_error, 0, - "Factory 'sysv' does not exist: no System V thread support under Windows"); -#endif - else if (!strcmp(name, "lua")) -#ifdef HAVE_LUA - SIMIX_ctx_lua_factory_init(factory); -#else - - THROW0(not_found_error, 0, - "Factory 'lua' does not exist: Lua support was not compiled in the SimGrid library"); -#endif /* HAVE_LUA */ - - else - THROW1(not_found_error, 0, "Factory '%s' does not exist", name); - - +void SIMIX_context_set_nthreads(int nb_threads) { + xbt_assert1(nb_threads > 0, "Invalid number of parallel threads: %d", nb_threads); + smx_parallel_contexts = nb_threads; +} - SIMIX_create_maestro_process(); +/** + * \brief Returns the number of parallel threads used + * for the user contexts. + * \return the number of threads (1 means no parallelism) + */ +int SIMIX_context_get_nthreads() { + return smx_parallel_contexts; +} - return 0; +/** + * \brief Returns whether some parallel threads are used + * for the user contexts. + * \return 1 if parallelism is used + */ +int SIMIX_context_is_parallel() { + return smx_parallel_contexts > 1; }