X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..37151c0d4c6efccef4ac99502864f1a7d8fc830b:/src/simix/smx_context_thread.c diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c index 3d5ab923c8..c8260dbcb6 100644 --- a/src/simix/smx_context_thread.c +++ b/src/simix/smx_context_thread.c @@ -7,13 +7,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/function_types.h" -#include "private.h" - +#include "smx_private.h" #include "portable.h" /* loads context system definitions */ #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" #include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ -#include "simix/smx_context_private.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); @@ -24,65 +22,87 @@ typedef struct s_smx_ctx_thread { xbt_os_sem_t end; /* this semaphore is used to schedule/unschedule the process */ } s_smx_ctx_thread_t, *smx_ctx_thread_t; +static xbt_os_sem_t smx_ctx_thread_sem; + static smx_context_t smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char **argv, void_pfn_smxprocess_t cleanup_func, - smx_process_t process); + void *data); static void smx_ctx_thread_free(smx_context_t context); static void smx_ctx_thread_stop(smx_context_t context); static void smx_ctx_thread_suspend(smx_context_t context); -static void smx_ctx_thread_resume(smx_context_t new_context); -static void smx_ctx_thread_runall_serial(xbt_swag_t processes); -static void smx_ctx_thread_runall_parallel(xbt_swag_t processes); -static smx_process_t smx_ctx_thread_self(void); +static void smx_ctx_thread_runall_serial(void); +static void smx_ctx_thread_runall_parallel(void); +static smx_context_t smx_ctx_thread_self(void); +static int smx_ctx_thread_factory_finalize(smx_context_factory_t *factory); static void *smx_ctx_thread_wrapper(void *param); void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) { - smx_ctx_base_factory_init(factory); + XBT_VERB("Activating thread context factory"); + (*factory)->finalize = smx_ctx_thread_factory_finalize; (*factory)->create_context = smx_ctx_thread_factory_create_context; /* Do not overload that method (*factory)->finalize */ (*factory)->free = smx_ctx_thread_free; (*factory)->stop = smx_ctx_thread_stop; (*factory)->suspend = smx_ctx_thread_suspend; - if(_surf_parallel_contexts) + if (SIMIX_context_is_parallel()) (*factory)->runall = smx_ctx_thread_runall_parallel; else (*factory)->runall = smx_ctx_thread_runall_serial; - + (*factory)->self = smx_ctx_thread_self; (*factory)->name = "ctx_thread_factory"; + + if (SIMIX_context_is_parallel()) { + smx_ctx_thread_sem = xbt_os_sem_init(SIMIX_context_get_nthreads()); + } else { + smx_ctx_thread_sem = NULL; + } +} + +static int smx_ctx_thread_factory_finalize(smx_context_factory_t *factory) +{ + if (smx_ctx_thread_sem) { + xbt_os_sem_destroy(smx_ctx_thread_sem); + smx_ctx_thread_sem = NULL; + } + return smx_ctx_base_factory_finalize(factory); } static smx_context_t smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char **argv, void_pfn_smxprocess_t cleanup_func, - smx_process_t process) + void *data) { smx_ctx_thread_t context = (smx_ctx_thread_t) smx_ctx_base_factory_create_context_sized(sizeof(s_smx_ctx_thread_t), code, argc, argv, - cleanup_func, process); + cleanup_func, data); /* If the user provided a function for the process then use it otherwise is the context for maestro */ if (code) { context->begin = xbt_os_sem_init(0); context->end = xbt_os_sem_init(0); + /* create and start the process */ + /* NOTE: The first argument to xbt_os_thread_create used to be the process * + * name, but now the name is stored at SIMIX level, so we pass a null */ + context->thread = + xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, context, context); + /* wait the starting of the newly created process */ + xbt_os_sem_acquire(context->end); - /* delay the thread creation until first run */ - context->thread = NULL; - } else { - xbt_os_thread_set_extra_data(process); + xbt_os_thread_set_extra_data(context); } return (smx_context_t) context; @@ -92,31 +112,29 @@ static void smx_ctx_thread_free(smx_context_t pcontext) { smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext; - /* check if the context has a thread or not */ - /* if it doesn't, it is maestro's context or the context never run */ + /* check if this is the context of maestro (it doesn't have a real thread) */ if (context->thread) { /* wait about the thread terminason */ xbt_os_thread_join(context->thread, NULL); - } - - /* destroy the synchronisation objects */ - if(context->begin) - xbt_os_sem_destroy(context->begin); - if(context->end) + /* destroy the synchronisation objects */ + xbt_os_sem_destroy(context->begin); xbt_os_sem_destroy(context->end); - + } + smx_ctx_base_free(pcontext); } static void smx_ctx_thread_stop(smx_context_t pcontext) { - smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext; /* please no debug here: our procdata was already free'd */ smx_ctx_base_stop(pcontext); + if (smx_ctx_thread_sem) /* parallel run */ + xbt_os_sem_release(smx_ctx_thread_sem); + /* signal to the maestro that it has finished */ xbt_os_sem_release(((smx_ctx_thread_t) context)->end); @@ -132,6 +150,8 @@ static void *smx_ctx_thread_wrapper(void *param) /* Tell the maestro we are starting, and wait for its green light */ xbt_os_sem_release(context->end); xbt_os_sem_acquire(context->begin); + if (smx_ctx_thread_sem) /* parallel run */ + xbt_os_sem_acquire(smx_ctx_thread_sem); (context->super.code) (context->super.argc, context->super.argv); @@ -141,45 +161,39 @@ static void *smx_ctx_thread_wrapper(void *param) static void smx_ctx_thread_suspend(smx_context_t context) { - if(((smx_ctx_thread_t) context)->thread){ - xbt_os_sem_release(((smx_ctx_thread_t) context)->end); - xbt_os_sem_acquire(((smx_ctx_thread_t) context)->begin); - } + if (smx_ctx_thread_sem) /* parallel run */ + xbt_os_sem_release(smx_ctx_thread_sem); + xbt_os_sem_release(((smx_ctx_thread_t) context)->end); + xbt_os_sem_acquire(((smx_ctx_thread_t) context)->begin); + if (smx_ctx_thread_sem) /* parallel run */ + xbt_os_sem_acquire(smx_ctx_thread_sem); } -static void smx_ctx_thread_runall_serial(xbt_swag_t processes) +static void smx_ctx_thread_runall_serial(void) { smx_process_t process; - while((process = xbt_swag_extract(processes))){ - /* if the context has no thread associated, create one for it (first run) */ - if(!(((smx_ctx_thread_t)process->context)->thread)){ - ((smx_ctx_thread_t)process->context)->thread = - xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, process->context, process); - xbt_os_sem_acquire(((smx_ctx_thread_t)process->context)->end); - } - xbt_os_sem_release(((smx_ctx_thread_t) (process->context))->begin); - xbt_os_sem_acquire(((smx_ctx_thread_t) (process->context))->end); - } -} + unsigned int cursor; -static void smx_ctx_thread_runall_parallel(xbt_swag_t processes){ - smx_process_t process, p_next; - xbt_swag_foreach_safe(process, p_next, processes){ - /* if the context has no thread associated, create one for it (first run) */ - if(!(((smx_ctx_thread_t)process->context)->thread)){ - ((smx_ctx_thread_t)process->context)->thread = - xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, process->context, process); - xbt_os_sem_acquire(((smx_ctx_thread_t)process->context)->end); - } - xbt_os_sem_release(((smx_ctx_thread_t) (process->context))->begin); + xbt_dynar_foreach(simix_global->process_to_run, cursor, process) { + xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin); + xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end); } +} + +static void smx_ctx_thread_runall_parallel(void) +{ + unsigned int index; + smx_process_t process; + + xbt_dynar_foreach(simix_global->process_to_run, index, process) + xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin); - while((process = xbt_swag_extract(processes))){ - xbt_os_sem_acquire(((smx_ctx_thread_t) (process->context))->end); + xbt_dynar_foreach(simix_global->process_to_run, index, process) { + xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end); } } -static smx_process_t smx_ctx_thread_self(void) +static smx_context_t smx_ctx_thread_self(void) { - return (smx_process_t) xbt_os_thread_get_extra_data(); -} \ No newline at end of file + return (smx_context_t) xbt_os_thread_get_extra_data(); +}