X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef55efeefd6d977830776142370f5e26ee2d23f6..07034eaa7d8fbbc23d0918c256174e5356a330d2:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 8def97a56d..12408c3450 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -6,56 +6,85 @@ /* 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 "smx_context_sysv_private.h" +#include "xbt/parmap.h" +#include "simix/private.h" #ifdef HAVE_VALGRIND_VALGRIND_H # include -#endif /* HAVE_VALGRIND_VALGRIND_H */ +#endif /* HAVE_VALGRIND_VALGRIND_H */ #ifdef _XBT_WIN32 - #include "win32_ucontext.h" - #include "win32_ucontext.c" +#include "win32_ucontext.h" +#include "win32_ucontext.c" #else - #include "ucontext.h" +#include "ucontext.h" #endif XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); -static smx_context_t -smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char** argv, - void_f_pvoid_t cleanup_func, void* cleanup_arg); - +static xbt_parmap_t parmap; -static void smx_ctx_sysv_wrapper(void); +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); -void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { +static void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context); +void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) +{ smx_ctx_base_factory_init(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)->resume = smx_ctx_sysv_resume; (*factory)->name = "smx_sysv_context_factory"; + + if(_surf_parallel_contexts){ +#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */ + parmap = xbt_parmap_new(2); + (*factory)->runall = smx_ctx_sysv_runall_parallel; + (*factory)->self = smx_ctx_sysv_self_parallel; +#else + THROW0(arg_error, 0, "No thread support for parallel context execution"); +#endif + }else{ + (*factory)->runall = smx_ctx_sysv_runall; + } } -smx_context_t -smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, int argc, char** argv, - void_f_pvoid_t cleanup_func, void* cleanup_arg) { +int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) +{ + if(parmap) + xbt_parmap_destroy(parmap); + return smx_ctx_base_factory_finalize(factory); +} - smx_ctx_sysv_t context = (smx_ctx_sysv_t)smx_ctx_base_factory_create_context_sized - (size, code,argc,argv,cleanup_func,cleanup_arg); +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) +{ + + smx_ctx_sysv_t context = + (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size, + code, + argc, + argv, + cleanup_func, + data); /* If the user provided a function for the process then use it otherwise is the context for maestro */ - if(code){ + if (code) { xbt_assert2(getcontext(&(context->uc)) == 0, - "Error in context saving: %d (%s)", errno, strerror(errno)); + "Error in context saving: %d (%s)", errno, + strerror(errno)); context->uc.uc_link = NULL; @@ -68,72 +97,104 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, int argc, c #ifdef HAVE_VALGRIND_VALGRIND_H context->valgrind_stack_id = VALGRIND_STACK_REGISTER(context->uc.uc_stack.ss_sp, - ((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, smx_ctx_sysv_wrapper, 0); + ((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); + }else{ + maestro_context = context; } - return (smx_context_t)context; + return (smx_context_t) context; } static smx_context_t -smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char** argv, - void_f_pvoid_t cleanup_func, void* cleanup_arg) { +smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv, + void_pfn_smxprocess_t cleanup_func, + void *data) +{ return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t), - code,argc,argv,cleanup_func,cleanup_arg); + code, argc, argv, cleanup_func, + data); } -void smx_ctx_sysv_free(smx_context_t context) { +void smx_ctx_sysv_free(smx_context_t context) +{ - if (context){ + if (context) { #ifdef HAVE_VALGRIND_VALGRIND_H - VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) context)->valgrind_stack_id); -#endif /* HAVE_VALGRIND_VALGRIND_H */ + VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) + context)->valgrind_stack_id); +#endif /* HAVE_VALGRIND_VALGRIND_H */ } smx_ctx_base_free(context); } -void smx_ctx_sysv_stop(smx_context_t context) { +void smx_ctx_sysv_stop(smx_context_t context) +{ smx_ctx_base_stop(context); - smx_ctx_sysv_suspend(context); } -void smx_ctx_sysv_wrapper() { - /*FIXME: I would like to avoid accessing simix_global to get the current - context by passing it as an argument of the wrapper function. The problem - is that this function is called from smx_ctx_sysv_start, and uses - makecontext for calling it, and the stupid posix specification states that - all the arguments of the function should be int(32 bits), making it useless - in 64-bit architectures where pointers are 64 bit long. - */ - smx_ctx_sysv_t context = - (smx_ctx_sysv_t)simix_global->current_process->context; - +void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context) +{ (context->super.code) (context->super.argc, context->super.argv); - smx_ctx_sysv_stop((smx_context_t)context); + smx_ctx_sysv_stop((smx_context_t) context); } -void smx_ctx_sysv_suspend(smx_context_t context) { - ucontext_t maestro_ctx = ((smx_ctx_sysv_t)simix_global->maestro_process->context)->uc; +void smx_ctx_sysv_suspend(smx_context_t context) +{ + smx_current_context = (smx_context_t)maestro_context; + int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &((smx_ctx_sysv_t)context)->old_uc); + + xbt_assert0((rv == 0), "Context swapping failure"); +} - int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx); +void smx_ctx_sysv_resume(smx_context_t context) +{ + smx_current_context = context; + int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc); xbt_assert0((rv == 0), "Context swapping failure"); } -void smx_ctx_sysv_resume(smx_context_t new_context) { - smx_ctx_sysv_t maestro = (smx_ctx_sysv_t)simix_global->maestro_process->context; +void smx_ctx_sysv_runall(xbt_dynar_t processes) +{ + smx_process_t process; + unsigned int cursor; - int rv = swapcontext(&(maestro->uc), &((smx_ctx_sysv_t)new_context)->uc); + xbt_dynar_foreach(processes, cursor, process) { + smx_ctx_sysv_resume(process->context); + } + xbt_dynar_reset(processes); +} + +void smx_ctx_sysv_resume_parallel(smx_process_t process) +{ + smx_context_t context = process->context; + xbt_os_thread_set_extra_data(context); + int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc); + xbt_os_thread_set_extra_data(NULL); xbt_assert0((rv == 0), "Context swapping failure"); } + +void smx_ctx_sysv_runall_parallel(xbt_dynar_t processes) +{ + 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; +}