X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2ddd4202532d54d217533b97ffde98f1ab078a11..06719c673be736decee093e3f4750580c402552c:/src/simix/smx_context_thread.c diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c index 5647ffd49f..51593917ca 100644 --- a/src/simix/smx_context_thread.c +++ b/src/simix/smx_context_thread.c @@ -1,8 +1,7 @@ -/* $Id$ */ - /* context_thread - implementation of context switching with native threads */ -/* Copyright (c) 2004-2008 the SimGrid team. All right reserved */ +/* Copyright (c) 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* 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. */ @@ -13,70 +12,66 @@ #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 */ +#include "simix/smx_context_private.h" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smx_context); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); typedef struct s_smx_ctx_thread { - SMX_CTX_BASE_T; + s_smx_ctx_base_t super; /* Fields of super implementation */ xbt_os_thread_t thread; /* a plain dumb thread (portable to posix or windows) */ xbt_os_sem_t begin; /* this semaphore is used to schedule/yield the process */ 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 int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory); +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 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 new_context); static void *smx_ctx_thread_wrapper(void *param); -void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) -{ - *factory = xbt_new0(s_smx_context_factory_t, 1); +void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) { + + smx_ctx_base_factory_init(factory); (*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; + /* Do not overload that method (*factory)->finalize */ (*factory)->free = smx_ctx_thread_free; - (*factory)->start = smx_ctx_thread_start; (*factory)->stop = smx_ctx_thread_stop; (*factory)->suspend = smx_ctx_thread_suspend; (*factory)->resume = smx_ctx_thread_resume; (*factory)->name = "ctx_thread_factory"; } -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) { - return (smx_context_t) xbt_new0(s_smx_ctx_thread_t, 1); -} + smx_ctx_thread_t context = (smx_ctx_thread_t)smx_ctx_base_factory_create_context_sized + (sizeof(s_smx_ctx_thread_t), code,argc,argv,cleanup_func,cleanup_arg); -static int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory) -{ - free(*factory); - *factory = NULL; - return 0; -} + /* If the user provided a function for the process then use it + otherwise is the context for maestro */ + if(code){ + context->begin = xbt_os_sem_init(0); + context->end = xbt_os_sem_init(0); -static smx_context_t smx_ctx_thread_factory_create_context(xbt_main_func_t code) -{ - 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); + /* 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 */ + context->thread = + xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, context); + /* wait the starting of the newly created process */ + xbt_os_sem_acquire(context->end); + } + return (smx_context_t)context; } @@ -84,46 +79,33 @@ static void smx_ctx_thread_free(smx_context_t pcontext) { 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); } - - /* finally destroy the context */ - free(context); + + smx_ctx_base_free(pcontext); } -static void smx_ctx_thread_start(smx_context_t context) +static void smx_ctx_thread_stop(smx_context_t pcontext) { - smx_ctx_thread_t ctx_thread = (smx_ctx_thread_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 */ - ctx_thread->thread = - xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, ctx_thread); - /* wait the starting of the newly created process */ - xbt_os_sem_acquire(ctx_thread->end); -} - -static void smx_ctx_thread_stop(int exit_code) -{ + 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); + smx_ctx_base_stop(pcontext); /* 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,20 +116,18 @@ 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->super.code) (context->super.argc, context->super.argv); + + smx_ctx_thread_stop((smx_context_t)context); return NULL; } -static void smx_ctx_thread_suspend(smx_context_t context) -{ +static void smx_ctx_thread_suspend(smx_context_t context) { xbt_os_sem_release(((smx_ctx_thread_t) context)->end); xbt_os_sem_acquire(((smx_ctx_thread_t) context)->begin); } -static void smx_ctx_thread_resume(smx_context_t not_used, - smx_context_t new_context) -{ +static void smx_ctx_thread_resume(smx_context_t new_context) { xbt_os_sem_release(((smx_ctx_thread_t) new_context)->begin); xbt_os_sem_acquire(((smx_ctx_thread_t) new_context)->end); -} \ No newline at end of file +}