X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2ddd4202532d54d217533b97ffde98f1ab078a11..496721993cb6a1a41c1b9402a274b5d143aa373a:/src/simix/smx_context_thread.c diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c index 5647ffd49f..7f6c139575 100644 --- a/src/simix/smx_context_thread.c +++ b/src/simix/smx_context_thread.c @@ -13,8 +13,9 @@ #include "portable.h" /* loads context system definitions */ #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" +#include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smx_context); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); typedef struct s_smx_ctx_thread { SMX_CTX_BASE_T; @@ -23,9 +24,9 @@ typedef struct s_smx_ctx_thread { xbt_os_sem_t end; /* this semaphore is used to schedule/unschedule the process */ } s_smx_ctx_thread_t, *smx_ctx_thread_t; -static smx_context_t smx_ctx_thread_factory_create_context(xbt_main_func_t code); - -static smx_context_t smx_ctx_thread_factory_create_master_context(void); +static smx_context_t +smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char** argv, + void_f_pvoid_t cleanup_func, void* cleanup_arg); static int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory); @@ -33,22 +34,24 @@ static void smx_ctx_thread_free(smx_context_t context); static void smx_ctx_thread_start(smx_context_t context); -static void smx_ctx_thread_stop(int exit_code); +static void smx_ctx_thread_stop(smx_context_t context); static void smx_ctx_thread_suspend(smx_context_t context); -static void smx_ctx_thread_resume(smx_context_t old_context, - smx_context_t new_context); +static void + smx_ctx_thread_resume(smx_context_t old_context, smx_context_t new_context); static void *smx_ctx_thread_wrapper(void *param); void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) { + /* Initialize the thread portability layer + xbt_os_thread_mod_init();*/ + *factory = xbt_new0(s_smx_context_factory_t, 1); (*factory)->create_context = smx_ctx_thread_factory_create_context; (*factory)->finalize = smx_ctx_thread_factory_finalize; - (*factory)->create_maestro_context = smx_ctx_thread_factory_create_master_context; (*factory)->free = smx_ctx_thread_free; (*factory)->start = smx_ctx_thread_start; (*factory)->stop = smx_ctx_thread_stop; @@ -57,43 +60,59 @@ void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) (*factory)->name = "ctx_thread_factory"; } -static smx_context_t smx_ctx_thread_factory_create_master_context(void) -{ - return (smx_context_t) xbt_new0(s_smx_ctx_thread_t, 1); -} - static int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory) { + /* Stop the thread portability layer + xbt_os_thread_mod_exit();*/ free(*factory); *factory = NULL; return 0; } -static smx_context_t smx_ctx_thread_factory_create_context(xbt_main_func_t code) +static smx_context_t +smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char** argv, + void_f_pvoid_t cleanup_func, void* cleanup_arg) { smx_ctx_thread_t context = xbt_new0(s_smx_ctx_thread_t, 1); - context->code = code; - context->begin = xbt_os_sem_init(0); - context->end = xbt_os_sem_init(0); - + /* If the user provided a function for the process then use it + otherwise is the context for maestro */ + if(code){ + context->code = code; + context->argc = argc; + context->argv = argv; + context->cleanup_func = cleanup_func; + context->cleanup_arg = cleanup_arg; + context->begin = xbt_os_sem_init(0); + context->end = xbt_os_sem_init(0); + } + return (smx_context_t)context; } static void smx_ctx_thread_free(smx_context_t pcontext) { + int i; smx_ctx_thread_t context = (smx_ctx_thread_t)pcontext; - /* Check if this is the context of maestro (it doesn't has a real thread) */ + /* check if this is the context of maestro (it doesn't has a real thread) */ if (context->thread) { /* wait about the thread terminason */ xbt_os_thread_join(context->thread, NULL); - free(context->thread); /* destroy the synchronisation objects */ xbt_os_sem_destroy(context->begin); xbt_os_sem_destroy(context->end); } + + /* free argv */ + if (context->argv) { + for (i = 0; i < context->argc; i++) + if (context->argv[i]) + free(context->argv[i]); + + free(context->argv); + } /* finally destroy the context */ free(context); @@ -105,7 +124,7 @@ static void smx_ctx_thread_start(smx_context_t context) /* create and start the process */ /* NOTE: The first argument to xbt_os_thread_create used to be the process * - * name, but now the name is stored at simix level, so we pass a null */ + * name, but now the name is stored at SIMIX level, so we pass a null */ ctx_thread->thread = xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, ctx_thread); @@ -113,17 +132,21 @@ static void smx_ctx_thread_start(smx_context_t context) xbt_os_sem_acquire(ctx_thread->end); } -static void smx_ctx_thread_stop(int exit_code) +static void smx_ctx_thread_stop(smx_context_t pcontext) { + + smx_ctx_thread_t context = (smx_ctx_thread_t)pcontext; + /* 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); + if (context->cleanup_func) + (*context->cleanup_func) (context->cleanup_arg); /* signal to the maestro that it has finished */ - xbt_os_sem_release(((smx_ctx_thread_t) simix_global->current_process->context)->end); + xbt_os_sem_release(((smx_ctx_thread_t) context)->end); /* exit */ - xbt_os_thread_exit(NULL); /* We should provide return value in case other wants it */ + /* We should provide return value in case other wants it */ + xbt_os_thread_exit(NULL); } static void *smx_ctx_thread_wrapper(void *param) @@ -134,8 +157,9 @@ static void *smx_ctx_thread_wrapper(void *param) xbt_os_sem_release(context->end); xbt_os_sem_acquire(context->begin); - smx_ctx_thread_stop((context->code) (simix_global->current_process->argc, - simix_global->current_process->argv)); + (context->code) (context->argc, context->argv); + + smx_ctx_thread_stop((smx_context_t)context); return NULL; }