X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac2da2e897e8e361f5476beb2f0c28254a90005b..23f5bf52cc58cf837840f231cf638e9fcd45097b:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index f57d5a942d..9764af2660 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -8,32 +8,51 @@ #include -#include "smx_context_sysv_private.h" #include "xbt/parmap.h" -#include "simix/private.h" +#include "smx_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 */ +#include "mc/mc.h" #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); -#ifdef CONTEXT_THREADS -static xbt_parmap_t smx_ctx_sysv_parmap; -static ucontext_t* smx_ctx_sysv_local_maestro_uc; /* space to save maestro's stack in each thread */ +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 -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 smx_ctx_sysv_maestro_context; + 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 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 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); @@ -50,21 +69,11 @@ 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); - -/* 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)) -union u_ctx_addr { - void *addr; - int intv[CTX_ADDR_LEN]; -}; -#if (CTX_ADDR_LEN == 1) -# define CTX_ADDR_SPLIT(u) (u).intv[0] -#elif (CTX_ADDR_LEN == 2) -# define CTX_ADDR_SPLIT(u) (u).intv[0], (u).intv[1] -#else -# error Your architecture is not supported yet -#endif +/* This is a bit paranoid about sizeof(smx_ctx_sysv_t) not being a multiple of + * sizeof(int), but it doesn't harm. */ +#define CTX_ADDR_LEN \ + (sizeof(smx_ctx_sysv_t) / sizeof(int) + \ + !!(sizeof(smx_ctx_sysv_t) % sizeof(int))) void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { @@ -78,14 +87,14 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) (*factory)->name = "smx_sysv_context_factory"; if (SIMIX_context_is_parallel()) { -#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */ +#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */ int nthreads = SIMIX_context_get_nthreads(); - smx_ctx_sysv_parmap = xbt_parmap_new(nthreads); - smx_ctx_sysv_local_maestro_uc = xbt_new(ucontext_t, nthreads); + sysv_parmap = xbt_parmap_new(nthreads, SIMIX_context_get_parallel_mode()); + 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 @@ -96,23 +105,23 @@ 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 (smx_ctx_sysv_parmap) - xbt_parmap_destroy(smx_ctx_sysv_parmap); - xbt_free(smx_ctx_sysv_local_maestro_uc); + 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, void *data) { - union u_ctx_addr ctx_addr; + int ctx_addr[CTX_ADDR_LEN]; smx_ctx_sysv_t context = (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size, code, @@ -125,10 +134,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; @@ -144,13 +150,27 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, ((char *) context->uc.uc_stack.ss_sp) + context->uc.uc_stack.ss_size); #endif /* HAVE_VALGRIND_VALGRIND_H */ - ctx_addr.addr = context; - makecontext(&context->uc, (void (*)())smx_ctx_sysv_wrapper, - CTX_ADDR_LEN, CTX_ADDR_SPLIT(ctx_addr)); + memcpy(ctx_addr, &context, sizeof(smx_ctx_sysv_t)); + switch (CTX_ADDR_LEN) { + case 1: + makecontext(&context->uc, (void (*)())smx_ctx_sysv_wrapper, + 1, ctx_addr[0]); + break; + case 2: + makecontext(&context->uc, (void (*)())smx_ctx_sysv_wrapper, + 2, ctx_addr[0], ctx_addr[1]); + break; + default: + xbt_die("Ucontexts are not supported on this arch yet (addr len = %zu/%zu = %zu)", + sizeof(smx_ctx_sysv_t), sizeof(int), CTX_ADDR_LEN); + } } else { - smx_ctx_sysv_maestro_context = context; + sysv_maestro_context = context; } + if(MC_is_active() && code) + MC_new_stack_area(context, ((smx_process_t)((smx_context_t)context)->data)->name, &(context->uc), size); + return (smx_context_t) context; } @@ -166,7 +186,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) { @@ -180,21 +200,21 @@ 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; + int ctx_addr[CTX_ADDR_LEN]; smx_ctx_sysv_t context; - ctx_addr.intv[0] = first; + ctx_addr[0] = first; if (CTX_ADDR_LEN > 1) { va_list ap; int i; va_start(ap, first); for (i = 1; i < CTX_ADDR_LEN; i++) - ctx_addr.intv[i] = va_arg(ap, int); + ctx_addr[i] = va_arg(ap, int); va_end(ap); } - context = ctx_addr.addr; + memcpy(&context, ctx_addr, sizeof(smx_ctx_sysv_t)); (context->super.code) (context->super.argc, context->super.argv); simix_global->context_factory->stop((smx_context_t) context); @@ -210,7 +230,12 @@ 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(MC_is_active()){ + MC_ignore_stack("next_context", "smx_ctx_sysv_suspend_serial"); + MC_ignore_stack("i", "smx_ctx_sysv_suspend_serial"); + } if (i < xbt_dynar_length(simix_global->process_to_run)) { /* execute the next process */ @@ -221,7 +246,7 @@ static void smx_ctx_sysv_suspend_serial(smx_context_t context) else { /* all processes were run, return to maestro */ XBT_DEBUG("No more process to run"); - next_context = (smx_context_t) smx_ctx_sysv_maestro_context; + next_context = (smx_context_t) sysv_maestro_context; } SIMIX_context_set_current(next_context); swapcontext(&((smx_ctx_sysv_t) context)->uc, @@ -232,20 +257,18 @@ 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(&smx_ctx_sysv_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) { - smx_process_t first_process = - xbt_dynar_get_as(simix_global->process_to_run, 0, smx_process_t); - smx_ctx_sysv_process_index = 1; + smx_process_t first_process = + xbt_dynar_get_as(simix_global->process_to_run, 0, smx_process_t); + sysv_process_index = 1; - /* execute the first process */ - smx_ctx_sysv_resume_serial(first_process); - } + /* execute the first process */ + smx_ctx_sysv_resume_serial(first_process); } static void smx_ctx_sysv_stop_parallel(smx_context_t context) @@ -258,52 +281,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(smx_ctx_sysv_parmap); + smx_process_t next_work = xbt_parmap_next(sysv_parmap); smx_context_t next_context; - ucontext_t* next_uc; + ucontext_t* next_stack; if (next_work != NULL) { /* there is a next process to resume */ XBT_DEBUG("Run next process"); next_context = next_work->context; - next_uc = &((smx_ctx_sysv_t) next_context)->uc; + 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) smx_ctx_sysv_maestro_context; - unsigned long worker_id = xbt_parmap_get_worker_id(smx_ctx_sysv_parmap); - next_uc = &smx_ctx_sysv_local_maestro_uc[worker_id]; + 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, next_uc); + swapcontext(&((smx_ctx_sysv_t) context)->uc, next_stack); #endif } static void smx_ctx_sysv_resume_parallel(smx_process_t first_process) { #ifdef CONTEXT_THREADS - unsigned long worker_id = xbt_parmap_get_worker_id(smx_ctx_sysv_parmap); - ucontext_t* local_maestro_uc = &smx_ctx_sysv_local_maestro_uc[worker_id]; + 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(local_maestro_uc, &((smx_ctx_sysv_t) context)->uc); + swapcontext(worker_stack, &((smx_ctx_sysv_t) context)->uc); #endif } static void smx_ctx_sysv_runall_parallel(void) { #ifdef CONTEXT_THREADS - xbt_parmap_apply(smx_ctx_sysv_parmap, (void_f_pvoid_t) smx_ctx_sysv_resume_parallel, + sysv_threads_working = 0; + xbt_parmap_apply(sysv_parmap, (void_f_pvoid_t) smx_ctx_sysv_resume_parallel, simix_global->process_to_run); #endif } - -smx_context_t smx_ctx_sysv_self_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(); -}