X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9161dd12dbb9c069f5e100d30f56bf7b6f1362f5..ac2da2e897e8e361f5476beb2f0c28254a90005b:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 9458a3b5ed..f57d5a942d 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -6,10 +6,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ - +#include #include "smx_context_sysv_private.h" -#include "xbt/threadpool.h" +#include "xbt/parmap.h" +#include "simix/private.h" +#include "gras_config.h" #ifdef HAVE_VALGRIND_VALGRIND_H # include @@ -17,46 +19,90 @@ #ifdef _XBT_WIN32 #include "win32_ucontext.h" -#include "win32_ucontext.c" #else #include "ucontext.h" #endif XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); -static xbt_tpool_t tpool; +#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 */ +#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; + 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); +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); + + +/* 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 -static void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context); - -void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory) +void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { smx_ctx_base_factory_init(factory); + XBT_VERB("Activating SYSV context factory"); (*factory)->finalize = smx_ctx_sysv_factory_finalize; (*factory)->create_context = smx_ctx_sysv_create_context; /* Do not overload that method (*factory)->finalize */ (*factory)->free = smx_ctx_sysv_free; - (*factory)->stop = smx_ctx_sysv_stop; - (*factory)->suspend = smx_ctx_sysv_suspend; (*factory)->name = "smx_sysv_context_factory"; - if(_surf_parallel_contexts){ - tpool = xbt_tpool_new(2, 10); + if (SIMIX_context_is_parallel()) { +#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); + (*factory)->stop = smx_ctx_sysv_stop_parallel; + (*factory)->suspend = smx_ctx_sysv_suspend_parallel; (*factory)->runall = smx_ctx_sysv_runall_parallel; - }else{ - (*factory)->runall = smx_ctx_sysv_runall; + (*factory)->self = smx_ctx_sysv_self_parallel; +#else + THROWF(arg_error, 0, "No thread support for parallel context execution"); +#endif + } else { + (*factory)->stop = smx_ctx_sysv_stop_serial; + (*factory)->suspend = smx_ctx_sysv_suspend_serial; + (*factory)->runall = smx_ctx_sysv_runall_serial; } } int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) { - if(tpool) - xbt_tpool_destroy(tpool); +#ifdef CONTEXT_THREADS + if (smx_ctx_sysv_parmap) + xbt_parmap_destroy(smx_ctx_sysv_parmap); + xbt_free(smx_ctx_sysv_local_maestro_uc); +#endif return smx_ctx_base_factory_finalize(factory); } @@ -66,7 +112,7 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, void_pfn_smxprocess_t cleanup_func, void *data) { - + union u_ctx_addr ctx_addr; smx_ctx_sysv_t context = (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size, code, @@ -75,21 +121,22 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, cleanup_func, data); - /* If the user provided a function for the process then use it - otherwise is the context for maestro */ + /* if the user provided a function for the process then use it, + otherwise it is the context for maestro */ if (code) { - xbt_assert2(getcontext(&(context->uc)) == 0, - "Error in context saving: %d (%s)", errno, - strerror(errno)); + int res = getcontext(&(context->uc)); + xbt_assert(res == 0, + "Error in context saving: %d (%s)", errno, + strerror(errno)); context->uc.uc_link = NULL; context->uc.uc_stack.ss_sp = - pth_skaddr_makecontext(context->stack, CONTEXT_STACK_SIZE); + pth_skaddr_makecontext(context->stack, smx_context_stack_size); context->uc.uc_stack.ss_size = - pth_sksize_makecontext(context->stack, CONTEXT_STACK_SIZE); + pth_sksize_makecontext(context->stack, smx_context_stack_size); #ifdef HAVE_VALGRIND_VALGRIND_H context->valgrind_stack_id = @@ -97,13 +144,14 @@ 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 */ - - makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper, - sizeof(void*)/sizeof(int), context); + ctx_addr.addr = context; + makecontext(&context->uc, (void (*)())smx_ctx_sysv_wrapper, + CTX_ADDR_LEN, CTX_ADDR_SPLIT(ctx_addr)); + } else { + smx_ctx_sysv_maestro_context = context; } return (smx_context_t) context; - } static smx_context_t @@ -112,7 +160,7 @@ smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv, void *data) { - return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t), + return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t) + smx_context_stack_size, code, argc, argv, cleanup_func, data); @@ -132,58 +180,130 @@ void smx_ctx_sysv_free(smx_context_t context) smx_ctx_base_free(context); } -void smx_ctx_sysv_stop(smx_context_t context) +void smx_ctx_sysv_wrapper(int first, ...) +{ + union u_ctx_addr ctx_addr; + smx_ctx_sysv_t context; + + ctx_addr.intv[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); + va_end(ap); + } + context = ctx_addr.addr; + (context->super.code) (context->super.argc, context->super.argv); + + simix_global->context_factory->stop((smx_context_t) context); +} + +static void smx_ctx_sysv_stop_serial(smx_context_t context) { smx_ctx_base_stop(context); - - smx_ctx_sysv_suspend(context); + smx_ctx_sysv_suspend_serial(context); } -void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context) -{ - (context->super.code) (context->super.argc, context->super.argv); +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++; + + if (i < xbt_dynar_length(simix_global->process_to_run)) { + /* 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) smx_ctx_sysv_maestro_context; + } + SIMIX_context_set_current(next_context); + swapcontext(&((smx_ctx_sysv_t) context)->uc, + &((smx_ctx_sysv_t) next_context)->uc); +} - smx_ctx_sysv_stop((smx_context_t) context); +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, + &((smx_ctx_sysv_t) context)->uc); } -void smx_ctx_sysv_suspend(smx_context_t context) +static void smx_ctx_sysv_runall_serial(void) { - ucontext_t maestro_ctx = - ((smx_ctx_sysv_t) simix_global->maestro_process->context)->uc; + 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; - int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx); + /* execute the first process */ + smx_ctx_sysv_resume_serial(first_process); + } +} - xbt_assert0((rv == 0), "Context swapping failure"); +static void smx_ctx_sysv_stop_parallel(smx_context_t context) +{ + smx_ctx_base_stop(context); + smx_ctx_sysv_suspend_parallel(context); } -void smx_ctx_sysv_resume(smx_context_t new_context) +static void smx_ctx_sysv_suspend_parallel(smx_context_t context) { - smx_ctx_sysv_t maestro = - (smx_ctx_sysv_t) simix_global->maestro_process->context; +#ifdef CONTEXT_THREADS + /* determine the next context */ + smx_process_t next_work = xbt_parmap_next(smx_ctx_sysv_parmap); + smx_context_t next_context; + ucontext_t* next_uc; + + 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; + } + 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]; + } - int rv = - swapcontext(&(maestro->uc), &((smx_ctx_sysv_t) new_context)->uc); + SIMIX_context_set_current(next_context); + swapcontext(&((smx_ctx_sysv_t) context)->uc, next_uc); +#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]; - xbt_assert0((rv == 0), "Context swapping failure"); + smx_context_t context = first_process->context; + SIMIX_context_set_current(context); + swapcontext(local_maestro_uc, &((smx_ctx_sysv_t) context)->uc); +#endif } -void smx_ctx_sysv_runall(xbt_swag_t processes) +static void smx_ctx_sysv_runall_parallel(void) { - smx_context_t old_context; - smx_process_t process; - - while((process = xbt_swag_extract(processes))){ - old_context = smx_current_context; - smx_current_context = process->context; - smx_ctx_sysv_resume(smx_current_context); - smx_current_context = old_context; - } +#ifdef CONTEXT_THREADS + xbt_parmap_apply(smx_ctx_sysv_parmap, (void_f_pvoid_t) smx_ctx_sysv_resume_parallel, + simix_global->process_to_run); +#endif } -void smx_ctx_sysv_runall_parallel(xbt_swag_t processes) +smx_context_t smx_ctx_sysv_self_parallel(void) { - smx_process_t process; - while((process = xbt_swag_extract(processes))){ - xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_sysv_resume, process->context); - } -} \ No newline at end of file + /*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(); +}