X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d683520a4fa56accfe70e693d9336dd740f7bf35..1cde906ff21eb6a3dd34cce742b544e1ddcb8994:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 0638d97f35..5834354e0b 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -9,22 +9,24 @@ #include "xbt/ex_interface.h" #include "private.h" - -#include "context_sysv_config.h" /* loads context system definitions */ +#include "context_sysv_config.h" /* loads context system definitions */ #include "portable.h" -#include /* context relative declarations */ -#define STACK_SIZE 128*1024 /* lower this if you want to reduce the memory consumption */ +#include /* context relative declarations */ + +/* lower this if you want to reduce the memory consumption */ +#define STACK_SIZE 128*1024 + #ifdef HAVE_VALGRIND_VALGRIND_H # include #endif /* HAVE_VALGRIND_VALGRIND_H */ -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smx_context); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); typedef struct s_smx_ctx_sysv { SMX_CTX_BASE_T; ucontext_t uc; /* the thread that execute the code */ char stack[STACK_SIZE]; /* the thread stack size */ - smx_process_t prev; /* the previous process */ + struct s_smx_ctx_sysv *prev; /* the previous process */ #ifdef HAVE_VALGRIND_VALGRIND_H unsigned int valgrind_stack_id; /* the valgrind stack id */ #endif @@ -35,42 +37,33 @@ typedef struct s_smx_ctx_sysv { static ex_ctx_t *xbt_jcontext_ex_ctx(void); /* callback: termination */ -static void xbt_jcontext_ex_terminate(xbt_ex_t * e); - -static int -smx_ctx_sysv_factory_create_context(smx_process_t *smx_process, xbt_main_func_t code); - -static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory); - -static int smx_ctx_sysv_factory_create_maestro_context(smx_process_t * maestro); - -static void smx_ctx_sysv_free(smx_process_t process); - -static void smx_ctx_sysv_kill(smx_process_t process); - -static void smx_ctx_sysv_schedule(smx_process_t process); +static void xbt_jcontext_ex_terminate(xbt_ex_t *e); -static void smx_ctx_sysv_yield(void); +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); -static void smx_ctx_sysv_start(smx_process_t process); +static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory); -static void smx_ctx_sysv_stop(int exit_code); +static smx_context_t smx_ctx_sysv_factory_create_maestro_context(void); -static void smx_ctx_sysv_swap(smx_process_t process); +static void smx_ctx_sysv_free(smx_context_t context); -static void smx_ctx_sysv_schedule(smx_process_t process); +static void smx_ctx_sysv_start(smx_context_t context); -static void smx_ctx_sysv_yield(void); +static void smx_ctx_sysv_stop(smx_context_t context); -static void smx_ctx_sysv_suspend(smx_process_t process); +static void smx_ctx_sysv_suspend(smx_context_t context); -static void smx_ctx_sysv_resume(smx_process_t process); +static void + smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context); static void smx_ctx_sysv_wrapper(void); /* callback: context fetching */ static ex_ctx_t *xbt_ctx_sysv_ex_ctx(void) { + /*FIXME: the factory should access simix level datastructures! */ return simix_global->current_process->context->exception; } @@ -81,7 +74,7 @@ static void xbt_ctx_sysv_ex_terminate(xbt_ex_t * e) abort(); } -void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory) +void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { *factory = xbt_new0(s_smx_context_factory_t, 1); @@ -89,11 +82,10 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory) (*factory)->finalize = smx_ctx_sysv_factory_finalize; (*factory)->create_maestro_context = smx_ctx_sysv_factory_create_maestro_context; (*factory)->free = smx_ctx_sysv_free; - (*factory)->kill = smx_ctx_sysv_kill; - (*factory)->schedule = smx_ctx_sysv_schedule; - (*factory)->yield = smx_ctx_sysv_yield; (*factory)->start = smx_ctx_sysv_start; (*factory)->stop = smx_ctx_sysv_stop; + (*factory)->suspend = smx_ctx_sysv_suspend; + (*factory)->resume = smx_ctx_sysv_resume; (*factory)->name = "smx_sysv_context_factory"; /* context exception handlers */ @@ -101,17 +93,14 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory) __xbt_ex_terminate = xbt_ctx_sysv_ex_terminate; } -static int smx_ctx_sysv_factory_create_maestro_context(smx_process_t *maestro) +static smx_context_t smx_ctx_sysv_factory_create_maestro_context() { smx_ctx_sysv_t context = xbt_new0(s_smx_ctx_sysv_t, 1); - context->exception = xbt_new(ex_ctx_t, 1); + context->exception = xbt_new(ex_ctx_t, 1); XBT_CTX_INITIALIZE(context->exception); - (*maestro)->context = (smx_context_t) context; - - return 0; - + return (smx_context_t)context; } static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory) @@ -122,10 +111,10 @@ static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory) return 0; } -static int -smx_ctx_sysv_factory_create_context(smx_process_t *smx_process, xbt_main_func_t code) +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) { - VERB1("Create context %s", (*smx_process)->name); smx_ctx_sysv_t context = xbt_new0(s_smx_ctx_sysv_t, 1); context->code = code; @@ -146,16 +135,17 @@ smx_ctx_sysv_factory_create_context(smx_process_t *smx_process, xbt_main_func_t context->exception = xbt_new(ex_ctx_t, 1); XBT_CTX_INITIALIZE(context->exception); - (*smx_process)->context = (smx_context_t)context; - (*smx_process)->iwannadie = 0; - - /* FIXME: Check what should return */ - return 1; + context->argc = argc; + context->argv = argv; + context->cleanup_func = cleanup_func; + context->cleanup_arg = cleanup_arg; + return (smx_context_t)context; } -static void smx_ctx_sysv_free(smx_process_t process) +static void smx_ctx_sysv_free(smx_context_t pcontext) { - smx_ctx_sysv_t context = (smx_ctx_sysv_t)process->context; + int i; + smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext; if (context){ if (context->exception) @@ -165,118 +155,74 @@ static void smx_ctx_sysv_free(smx_process_t process) VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) context)->valgrind_stack_id); #endif /* HAVE_VALGRIND_VALGRIND_H */ + /* free argv */ + if (context->argv) { + for (i = 0; i < context->argc; i++) + if (context->argv[i]) + free(context->argv[i]); + + free(context->argv); + } + /* destroy the context */ free(context); } } -static void smx_ctx_sysv_kill(smx_process_t process) -{ - DEBUG2("Kill process '%s' (from '%s')", process->name, - simix_global->current_process->name); - process->iwannadie = 1; - smx_ctx_sysv_swap(process); +static void smx_ctx_sysv_start(smx_context_t context) +{ + makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0); } -/** - * \param context the winner - * - * Calling this function blocks the current context and schedule \a context. - * When \a context will call xbt_context_yield, it will return - * to this function as if nothing had happened. - * - * Only the maestro can call this function to run a given process. - */ -static void smx_ctx_sysv_schedule(smx_process_t process) +static void smx_ctx_sysv_stop(smx_context_t pcontext) { - DEBUG1("Schedule process '%s'", process->name); - xbt_assert0((simix_global->current_process == simix_global->maestro_process), - "You are not supposed to run this function here!"); - smx_ctx_sysv_swap(process); -} + smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext; + + if (context->cleanup_func) + (*context->cleanup_func) (context->cleanup_arg); -/** - * Calling this function makes the current context yield. The context - * that scheduled it returns from xbt_context_schedule as if nothing - * had happened. - * - * Only the processes can call this function, giving back the control - * to the maestro - */ -static void smx_ctx_sysv_yield(void) -{ - DEBUG1("Yielding process '%s'", simix_global->current_process->name); - xbt_assert0((simix_global->current_process != simix_global->maestro_process), - "You are not supposed to run this function here!"); - smx_ctx_sysv_swap(simix_global->current_process); -} - -static void smx_ctx_sysv_start(smx_process_t process) -{ - /*DEBUG1("Start context '%s'", context->name);*/ - makecontext(&(((smx_ctx_sysv_t) process->context)->uc), smx_ctx_sysv_wrapper, 0); -} - -static void smx_ctx_sysv_stop(int exit_code) -{ - /* please no debug here: our procdata was already free'd */ - if (simix_global->current_process->cleanup_func) - ((*simix_global->current_process->cleanup_func)) (simix_global->current_process->cleanup_arg); - - smx_ctx_sysv_swap(simix_global->current_process); + smx_ctx_sysv_suspend((smx_context_t)context); } -static void smx_ctx_sysv_swap(smx_process_t process) +static void smx_ctx_sysv_wrapper() { - DEBUG2("Swap context: '%s' -> '%s'", simix_global->current_process->name, process->name); - xbt_assert0(simix_global->current_process, "You have to call context_init() first."); - xbt_assert0(process, "Invalid argument"); - - if (((smx_ctx_sysv_t) process->context)->prev == NULL) - smx_ctx_sysv_resume(process); - else - smx_ctx_sysv_suspend(process); - - if (simix_global->current_process->iwannadie) - smx_ctx_sysv_stop(1); -} - -static void smx_ctx_sysv_wrapper(void) -{ - smx_ctx_sysv_stop((*(simix_global->current_process->context->code)) - (simix_global->current_process->argc, simix_global->current_process->argv)); + /*FIXME: I would like to avoid accesing 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; + + (context->code) (context->argc, context->argv); + + smx_ctx_sysv_stop((smx_context_t)context); } -static void smx_ctx_sysv_suspend(smx_process_t process) +static void smx_ctx_sysv_suspend(smx_context_t context) { int rv; - DEBUG1("Suspend context: '%s'", simix_global->current_process->name); - smx_process_t prev_process = ((smx_ctx_sysv_t) process->context)->prev; - - simix_global->current_process = prev_process; + smx_ctx_sysv_t prev_context = ((smx_ctx_sysv_t) context)->prev; - ((smx_ctx_sysv_t) process->context)->prev = NULL; + ((smx_ctx_sysv_t) context)->prev = NULL; - rv = swapcontext(&(((smx_ctx_sysv_t) process->context)->uc), &(((smx_ctx_sysv_t)prev_process->context)->uc)); + rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &prev_context->uc); xbt_assert0((rv == 0), "Context swapping failure"); } -static void smx_ctx_sysv_resume(smx_process_t process) +static void +smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context) { int rv; - smx_ctx_sysv_t new_context = (smx_ctx_sysv_t)process->context; - smx_ctx_sysv_t prev_context = (smx_ctx_sysv_t)simix_global->current_process->context; - - DEBUG2("Resume context: '%s' (from '%s')", process->name, - simix_global->current_process->name); - - ((smx_ctx_sysv_t) process->context)->prev = simix_global->current_process; - simix_global->current_process = process; + ((smx_ctx_sysv_t) new_context)->prev = (smx_ctx_sysv_t)old_context; - rv = swapcontext(&prev_context->uc, &new_context->uc); + rv = swapcontext(&((smx_ctx_sysv_t)old_context)->uc, + &((smx_ctx_sysv_t)new_context)->uc); xbt_assert0((rv == 0), "Context swapping failure"); }