X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f6477dfb348f4dafbc34bae5476d45d821e3d2a3..d747238ce054a5db96974c9b2c888f922505f93b:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index d17a0807a8..18cd39fad8 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -6,9 +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 @@ -23,17 +26,35 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); -static xbt_tpool_t tpool; +#ifdef CONTEXT_THREADS +static xbt_parmap_t parmap; +#endif 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(smx_ctx_sysv_t context); +static void smx_ctx_sysv_wrapper(int count, ...); + +/* 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 void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { smx_ctx_base_factory_init(factory); + VERB0("Activating SYSV context factory"); (*factory)->finalize = smx_ctx_sysv_factory_finalize; (*factory)->create_context = smx_ctx_sysv_create_context; @@ -43,11 +64,12 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) (*factory)->suspend = smx_ctx_sysv_suspend; (*factory)->name = "smx_sysv_context_factory"; - if(_surf_parallel_contexts){ + if (SIMIX_context_is_parallel()) { #ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */ - tpool = xbt_tpool_new(2, 10); + parmap = xbt_parmap_new(2); (*factory)->runall = smx_ctx_sysv_runall_parallel; (*factory)->self = smx_ctx_sysv_self_parallel; + (*factory)->get_thread_id = smx_ctx_sysv_get_thread_id; #else THROW0(arg_error, 0, "No thread support for parallel context execution"); #endif @@ -58,8 +80,8 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) { - if(tpool) - xbt_tpool_destroy(tpool); + if(parmap) + xbt_parmap_destroy(parmap); return smx_ctx_base_factory_finalize(factory); } @@ -69,7 +91,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, @@ -89,10 +111,10 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, 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 = @@ -100,9 +122,9 @@ 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{ maestro_context = context; } @@ -117,7 +139,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); @@ -143,8 +165,21 @@ void smx_ctx_sysv_stop(smx_context_t context) smx_ctx_sysv_suspend(context); } -void smx_ctx_sysv_wrapper(smx_ctx_sysv_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); smx_ctx_sysv_stop((smx_context_t) context); @@ -166,34 +201,42 @@ void smx_ctx_sysv_resume(smx_context_t context) xbt_assert0((rv == 0), "Context swapping failure"); } -void smx_ctx_sysv_runall(xbt_swag_t processes) +void smx_ctx_sysv_runall(xbt_dynar_t processes) { smx_process_t process; - - while ((process = xbt_swag_extract(processes))) + unsigned int cursor; + + xbt_dynar_foreach(processes, cursor, process) { + DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes)); smx_ctx_sysv_resume(process->context); + } + xbt_dynar_reset(processes); } -void smx_ctx_sysv_resume_parallel(smx_context_t context) +void smx_ctx_sysv_resume_parallel(smx_process_t process) { - xbt_os_thread_set_extra_data(context); + smx_context_t context = process->context; + smx_current_context = (smx_context_t)context; int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc); - xbt_os_thread_set_extra_data(NULL); + smx_current_context = (smx_context_t)maestro_context; xbt_assert0((rv == 0), "Context swapping failure"); } -void smx_ctx_sysv_runall_parallel(xbt_swag_t processes) +void smx_ctx_sysv_runall_parallel(xbt_dynar_t processes) { - smx_process_t process; - while((process = xbt_swag_extract(processes))){ - xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_sysv_resume_parallel, process->context); - } - xbt_tpool_wait_all(tpool); + xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_sysv_resume_parallel, processes); + xbt_dynar_reset(processes); } 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; + /*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 smx_current_context; +} + +int smx_ctx_sysv_get_thread_id(void) +{ + return (int)(unsigned long)xbt_os_thread_get_extra_data(); }