X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da2ce25eaa2fbae84dd3308348b88dab9269211e..541ef281453c502f14fb19bd9d19e169a0a5d02a:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 984be819d7..8c8de2fd8a 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -8,31 +8,50 @@ #include -#include "smx_context_sysv_private.h" #include "xbt/parmap.h" -#include "xbt/parmap_private.h" #include "simix/private.h" #include "gras_config.h" - -#ifdef HAVE_VALGRIND_VALGRIND_H -# include -#endif /* HAVE_VALGRIND_VALGRIND_H */ +#include "context_sysv_config.h" /* loads context system definitions */ #ifdef _XBT_WIN32 -#include "win32_ucontext.h" +# include /* context relative declarations */ #else -#include "ucontext.h" +# include /* context relative declarations */ #endif +#ifdef HAVE_VALGRIND_VALGRIND_H +# include +#endif /* HAVE_VALGRIND_VALGRIND_H */ + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); +typedef struct s_smx_ctx_sysv { + s_smx_ctx_base_t super; /* Fields of super implementation */ + ucontext_t uc; /* the ucontext that executes the code */ +#ifdef HAVE_VALGRIND_VALGRIND_H + unsigned int valgrind_stack_id; /* the valgrind stack id */ +#endif + char stack[0]; /* the thread stack (must remain the last element of the structure) */ +} s_smx_ctx_sysv_t, *smx_ctx_sysv_t; + #ifdef CONTEXT_THREADS -static xbt_parmap_t parmap; +static xbt_parmap_t sysv_parmap; +static ucontext_t* sysv_workers_stacks; /* space to save the worker's stack in each thread */ +static unsigned long sysv_threads_working; /* number of threads that have started their work */ +static xbt_os_thread_key_t sysv_worker_id_key; /* thread-specific storage for the thread id */ #endif -static unsigned long smx_ctx_sysv_process_index = 0; /* index of the next process to run in the - * list of runnable processes */ -static smx_ctx_sysv_t maestro_context; +static unsigned long sysv_process_index = 0; /* index of the next process to run in the + * list of runnable processes */ +static smx_ctx_sysv_t sysv_maestro_context; +static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory); +static smx_context_t +smx_ctx_sysv_create_context_sized(size_t structure_size, + xbt_main_func_t code, int argc, + char **argv, + void_pfn_smxprocess_t cleanup_func, + void *data); +static void smx_ctx_sysv_free(smx_context_t context); static smx_context_t smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv, void_pfn_smxprocess_t cleanup_func, void* data); @@ -41,14 +60,14 @@ static void smx_ctx_sysv_wrapper(int count, ...); static void smx_ctx_sysv_stop_serial(smx_context_t context); static void smx_ctx_sysv_suspend_serial(smx_context_t context); +static void smx_ctx_sysv_resume_serial(smx_process_t first_process); static void smx_ctx_sysv_runall_serial(void); static void smx_ctx_sysv_stop_parallel(smx_context_t context); static void smx_ctx_sysv_suspend_parallel(smx_context_t context); +static void smx_ctx_sysv_resume_parallel(smx_process_t first_process); static void smx_ctx_sysv_runall_parallel(void); -static void smx_ctx_sysv_resume(smx_process_t first_process); - /* This is a bit paranoid about SIZEOF_VOIDP not being a multiple of SIZEOF_INT, * but it doesn't harm. */ #define CTX_ADDR_LEN (SIZEOF_VOIDP / SIZEOF_INT + !!(SIZEOF_VOIDP % SIZEOF_INT)) @@ -77,11 +96,13 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) if (SIMIX_context_is_parallel()) { #ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */ - parmap = xbt_parmap_new(2); + int nthreads = SIMIX_context_get_nthreads(); + sysv_parmap = xbt_parmap_new(nthreads); + sysv_workers_stacks = xbt_new(ucontext_t, nthreads); + xbt_os_thread_key_create(&sysv_worker_id_key); (*factory)->stop = smx_ctx_sysv_stop_parallel; (*factory)->suspend = smx_ctx_sysv_suspend_parallel; (*factory)->runall = smx_ctx_sysv_runall_parallel; - (*factory)->self = smx_ctx_sysv_self_parallel; #else THROWF(arg_error, 0, "No thread support for parallel context execution"); #endif @@ -92,16 +113,17 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) } } -int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) +static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) { #ifdef CONTEXT_THREADS - if (parmap) - xbt_parmap_destroy(parmap); + if (sysv_parmap) + xbt_parmap_destroy(sysv_parmap); + xbt_free(sysv_workers_stacks); #endif return smx_ctx_base_factory_finalize(factory); } -smx_context_t +static smx_context_t smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, int argc, char **argv, void_pfn_smxprocess_t cleanup_func, @@ -120,10 +142,7 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, otherwise it is the context for maestro */ if (code) { - int res = getcontext(&(context->uc)); - xbt_assert(res == 0, - "Error in context saving: %d (%s)", errno, - strerror(errno)); + getcontext(&(context->uc)); context->uc.uc_link = NULL; @@ -143,7 +162,7 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, makecontext(&context->uc, (void (*)())smx_ctx_sysv_wrapper, CTX_ADDR_LEN, CTX_ADDR_SPLIT(ctx_addr)); } else { - maestro_context = context; + sysv_maestro_context = context; } return (smx_context_t) context; @@ -161,7 +180,7 @@ smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv, } -void smx_ctx_sysv_free(smx_context_t context) +static void smx_ctx_sysv_free(smx_context_t context) { if (context) { @@ -175,7 +194,7 @@ void smx_ctx_sysv_free(smx_context_t context) smx_ctx_base_free(context); } -void smx_ctx_sysv_wrapper(int first, ...) +static void smx_ctx_sysv_wrapper(int first, ...) { union u_ctx_addr ctx_addr; smx_ctx_sysv_t context; @@ -205,43 +224,41 @@ static void smx_ctx_sysv_suspend_serial(smx_context_t context) { /* determine the next context */ smx_context_t next_context; - unsigned long int i = smx_ctx_sysv_process_index++; + unsigned long int i = sysv_process_index++; if (i < xbt_dynar_length(simix_global->process_to_run)) { - XBT_DEBUG("Run next process"); - /* execute the next process */ + XBT_DEBUG("Run next process"); next_context = xbt_dynar_get_as( simix_global->process_to_run,i, smx_process_t)->context; } else { /* all processes were run, return to maestro */ XBT_DEBUG("No more process to run"); - - next_context = (smx_context_t) maestro_context; + next_context = (smx_context_t) sysv_maestro_context; } SIMIX_context_set_current(next_context); swapcontext(&((smx_ctx_sysv_t) context)->uc, &((smx_ctx_sysv_t) next_context)->uc); } -static void smx_ctx_sysv_resume(smx_process_t first_process) +static void smx_ctx_sysv_resume_serial(smx_process_t first_process) { smx_context_t context = first_process->context; SIMIX_context_set_current(context); - swapcontext(&maestro_context->uc, + swapcontext(&sysv_maestro_context->uc, &((smx_ctx_sysv_t) context)->uc); } static void smx_ctx_sysv_runall_serial(void) { - if (xbt_dynar_length(simix_global->process_to_run) > 0) { + if (!xbt_dynar_is_empty(simix_global->process_to_run)) { smx_process_t first_process = xbt_dynar_get_as(simix_global->process_to_run, 0, smx_process_t); - smx_ctx_sysv_process_index = 1; + sysv_process_index = 1; /* execute the first process */ - smx_ctx_sysv_resume(first_process); + smx_ctx_sysv_resume_serial(first_process); } } @@ -255,37 +272,48 @@ static void smx_ctx_sysv_suspend_parallel(smx_context_t context) { #ifdef CONTEXT_THREADS /* determine the next context */ + smx_process_t next_work = xbt_parmap_next(sysv_parmap); smx_context_t next_context; - unsigned long int i = __sync_fetch_and_add(&parmap->index, 1); + ucontext_t* next_stack; - if (i < xbt_dynar_length(simix_global->process_to_run)) { - /* execute the next process */ + if (next_work != NULL) { + /* there is a next process to resume */ XBT_DEBUG("Run next process"); - next_context = xbt_dynar_get_as(simix_global->process_to_run, i, smx_process_t)->context; + next_context = next_work->context; + next_stack = &((smx_ctx_sysv_t) next_context)->uc; } else { /* all processes were run, go to the barrier */ XBT_DEBUG("No more processes to run"); - next_context = (smx_context_t) maestro_context; + next_context = (smx_context_t) sysv_maestro_context; + unsigned long worker_id = + (unsigned long) xbt_os_thread_get_specific(sysv_worker_id_key); + next_stack = &sysv_workers_stacks[worker_id]; } SIMIX_context_set_current(next_context); - swapcontext(&((smx_ctx_sysv_t) context)->uc, - &((smx_ctx_sysv_t) next_context)->uc); + swapcontext(&((smx_ctx_sysv_t) context)->uc, next_stack); #endif } -static void smx_ctx_sysv_runall_parallel(void) +static void smx_ctx_sysv_resume_parallel(smx_process_t first_process) { #ifdef CONTEXT_THREADS - xbt_parmap_apply(parmap, (void_f_pvoid_t) smx_ctx_sysv_resume, - simix_global->process_to_run); + unsigned long worker_id = __sync_fetch_and_add(&sysv_threads_working, 1); + xbt_os_thread_set_specific(sysv_worker_id_key, (void*) worker_id); + ucontext_t* worker_stack = &sysv_workers_stacks[worker_id]; + + smx_context_t context = first_process->context; + SIMIX_context_set_current(context); + swapcontext(worker_stack, &((smx_ctx_sysv_t) context)->uc); #endif } -smx_context_t smx_ctx_sysv_self_parallel(void) +static void smx_ctx_sysv_runall_parallel(void) { - /*smx_context_t self_context = (smx_context_t) xbt_os_thread_get_extra_data(); - return self_context ? self_context : (smx_context_t) maestro_context;*/ - return SIMIX_context_get_current(); +#ifdef CONTEXT_THREADS + sysv_threads_working = 0; + xbt_parmap_apply(sysv_parmap, (void_f_pvoid_t) smx_ctx_sysv_resume_parallel, + simix_global->process_to_run); +#endif }