X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/496721993cb6a1a41c1b9402a274b5d143aa373a..7e71d73eb6728d8d498d010976f038789049c131:/src/simix/smx_context_thread.c diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c index 7f6c139575..30c66538fc 100644 --- a/src/simix/smx_context_thread.c +++ b/src/simix/smx_context_thread.c @@ -29,13 +29,8 @@ smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char** arg void_f_pvoid_t cleanup_func, void* cleanup_arg); static int smx_ctx_thread_factory_finalize(smx_context_factory_t * factory); - 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(smx_context_t context); - static void smx_ctx_thread_suspend(smx_context_t context); static void @@ -45,9 +40,6 @@ 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; @@ -62,8 +54,6 @@ void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) 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; @@ -85,6 +75,16 @@ smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char** arg context->cleanup_arg = cleanup_arg; 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, ctx_thread); + + /* wait the starting of the newly created process */ + xbt_os_sem_acquire(context->end); } return (smx_context_t)context; @@ -118,20 +118,6 @@ static void smx_ctx_thread_free(smx_context_t pcontext) free(context); } -static void smx_ctx_thread_start(smx_context_t context) -{ - 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(smx_context_t pcontext) { @@ -174,4 +160,4 @@ static void smx_ctx_thread_resume(smx_context_t not_used, { 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 +}