From: mquinson Date: Tue, 23 Mar 2010 14:43:38 +0000 (+0000) Subject: Make the sysv context mechanism inheritable (lua will do so) X-Git-Tag: SVN~416 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2b0e833b299b04a1502b647df1a8ff240f9ea753 Make the sysv context mechanism inheritable (lua will do so) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7323 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/simix/smx_context_private.h b/src/simix/smx_context_private.h index 083c243a67..57a77fd37b 100644 --- a/src/simix/smx_context_private.h +++ b/src/simix/smx_context_private.h @@ -43,29 +43,15 @@ smx_ctx_base_factory_create_context_sized(size_t size, void smx_ctx_base_free(smx_context_t context); void smx_ctx_base_stop(smx_context_t context); - -/* *********************** */ -/* factory type definition */ -/* *********************** */ - - - -/* Selects a context factory associated with the name specified by the parameter name. - * If successful the function returns 0. Otherwise the function returns the error code. - */ -int SIMIX_context_select_factory(const char *name); - -/* Initializes a context factory from the name specified by the parameter name. - * If the factory cannot be found, an exception is raised. - */ -void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory, const char *name); - -/* All factories init */ -void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory); - -void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory); - -void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory); +/* Functions of sysv context mecanism: lua inherites them */ +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); +void smx_ctx_sysv_free(smx_context_t context); +void smx_ctx_sysv_stop(smx_context_t context); +void smx_ctx_sysv_suspend(smx_context_t context); +void smx_ctx_sysv_resume(smx_context_t new_context); SG_END_DECL() #endif /* !_XBT_CONTEXT_PRIVATE_H */ diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 202d4fae0b..47a7e55049 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -31,13 +31,9 @@ typedef struct s_smx_ctx_sysv { } s_smx_ctx_sysv_t, *smx_ctx_sysv_t; static smx_context_t -smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, +smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char** argv, void_f_pvoid_t cleanup_func, void* cleanup_arg); -static void smx_ctx_sysv_free(smx_context_t context); -static void smx_ctx_sysv_stop(smx_context_t context); -static void smx_ctx_sysv_suspend(smx_context_t context); -static void smx_ctx_sysv_resume(smx_context_t new_context); static void smx_ctx_sysv_wrapper(void); @@ -45,7 +41,7 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { smx_ctx_base_factory_init(factory); - (*factory)->create_context = smx_ctx_sysv_factory_create_context; + (*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; @@ -54,12 +50,12 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { (*factory)->name = "smx_sysv_context_factory"; } -static smx_context_t -smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, - void_f_pvoid_t cleanup_func, void* cleanup_arg) -{ +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) { + smx_ctx_sysv_t context = (smx_ctx_sysv_t)smx_ctx_base_factory_create_context_sized - (sizeof(s_smx_ctx_sysv_t), code,argc,argv,cleanup_func,cleanup_arg); + (size, code,argc,argv,cleanup_func,cleanup_arg); /* If the user provided a function for the process then use it otherwise is the context for maestro */ @@ -87,9 +83,19 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, } 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) { + + return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t), + code,argc,argv,cleanup_func,cleanup_arg); + } -static void smx_ctx_sysv_free(smx_context_t context) { +void smx_ctx_sysv_free(smx_context_t context) { if (context){ @@ -101,14 +107,13 @@ static void smx_ctx_sysv_free(smx_context_t context) { smx_ctx_base_free(context); } -static 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); } -static void smx_ctx_sysv_wrapper() -{ +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 @@ -124,7 +129,7 @@ static void smx_ctx_sysv_wrapper() smx_ctx_sysv_stop((smx_context_t)context); } -static void smx_ctx_sysv_suspend(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; int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx); @@ -132,8 +137,7 @@ static void smx_ctx_sysv_suspend(smx_context_t context) { xbt_assert0((rv == 0), "Context swapping failure"); } -static void -smx_ctx_sysv_resume(smx_context_t new_context) { +void smx_ctx_sysv_resume(smx_context_t new_context) { smx_ctx_sysv_t maestro = (smx_ctx_sysv_t)simix_global->maestro_process->context; int rv = swapcontext(&(maestro->uc), &((smx_ctx_sysv_t)new_context)->uc);