X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2485307bc9f202b0b96e735969b03ea7cf8a548..24805d9be154cac4d5300baecba35b4931204f97:/src/xbt/context.c diff --git a/src/xbt/context.c b/src/xbt/context.c index deb917cf02..930d4e18ad 100644 --- a/src/xbt/context.c +++ b/src/xbt/context.c @@ -14,6 +14,7 @@ #include "xbt/log.h" #include "xbt/dynar.h" #include "xbt/xbt_thread.h" +/*#include */ /* I need pthread_join that is not yet available in xbt_thread.*/ #ifdef CONTEXT_THREADS /* This file (context.c) is only loaded in libsimgrid, not libgras. @@ -32,7 +33,12 @@ static xbt_context_t current_context = NULL; static xbt_context_t init_context = NULL; static xbt_swag_t context_to_destroy = NULL; static xbt_swag_t context_living = NULL; +#ifdef CONTEXT_THREADS +static xbt_mutex_t creation_mutex; +static xbt_thcond_t creation_cond; +#endif +static void __context_exit(xbt_context_t context ,int value); static void __xbt_context_yield(xbt_context_t context) { xbt_assert0(current_context,"You have to call context_init() first."); @@ -42,17 +48,17 @@ static void __xbt_context_yield(xbt_context_t context) #ifdef CONTEXT_THREADS if (context){ xbt_context_t self = current_context; - DEBUG0("**** Locking ****"); + DEBUG1("[%p] **** Locking ****", self); xbt_mutex_lock(context->mutex); - DEBUG0("**** Updating current_context ****"); + DEBUG1("[%p] **** Updating current_context ****", self); current_context = context; - DEBUG0("**** Releasing the prisonner ****"); + DEBUG1("[%p] **** Releasing the prisonner ****", self); xbt_thcond_signal(context->cond); - DEBUG0("**** Going to jail ****"); + DEBUG1("[%p] **** Going to jail ****", self); xbt_thcond_wait(context->cond, context->mutex); - DEBUG0("**** Unlocking ****"); + DEBUG1("[%p] **** Unlocking ****", self); xbt_mutex_unlock(context->mutex); - DEBUG0("**** Updating current_context ****"); + DEBUG1("[%p] **** Updating current_context ****", self); current_context = self; } #else /* use SUSv2 contexts */ @@ -70,7 +76,7 @@ static void __xbt_context_yield(xbt_context_t context) if(context->save==NULL){ - DEBUG0("**** Yielding to somebody else ****"); + DEBUG1("[%p] **** Yielding to somebody else ****", current_context); DEBUG2("Saving current_context value (%p) to context(%p)->save",current_context,context); context->save = current_context ; DEBUG1("current_context becomes context(%p) ",context); @@ -81,7 +87,7 @@ static void __xbt_context_yield(xbt_context_t context) DEBUG1("I am (%p). Coming back\n",context); } else { xbt_context_t old_context = context->save ; - DEBUG0("**** Back ! ****"); + DEBUG1("[%p] **** Back ! ****", context); DEBUG2("Setting current_context (%p) to context(%p)->save",current_context,context); current_context = context->save ; DEBUG1("Setting context(%p)->save to NULL",context); @@ -94,6 +100,9 @@ static void __xbt_context_yield(xbt_context_t context) } } #endif + if(current_context->iwannadie) + __context_exit(current_context, 1); + return; } @@ -102,8 +111,15 @@ static void xbt_context_free(xbt_context_t context) if (!context) return; DEBUG1("Freeing %p",context); #ifdef CONTEXT_THREADS + /*DEBUG1("\t joining %p",(void *)context->thread->t);*/ + DEBUG1("\t joining %p",(void *)context->thread); + /*pthread_join(context->thread->t,NULL);*/ + xbt_thread_join(context->thread,NULL); + DEBUG1("\t xbt_free %p",(void *)context->thread); xbt_free(context->thread); + DEBUG1("\t mutex_destroy %p",(void *)context->mutex); xbt_mutex_destroy(context->mutex); + DEBUG1("\t cond_destroy %p",(void *)context->cond); xbt_thcond_destroy(context->cond); context->thread = NULL; @@ -121,6 +137,15 @@ static void xbt_context_free(xbt_context_t context) static void __context_exit(xbt_context_t context ,int value) { int i; + + DEBUG1("--------- %p is exiting ---------",context); + + DEBUG0("Calling cleanup functions"); + if(context->cleanup_func){ + DEBUG0("Calling cleanup function"); + context->cleanup_func(context->cleanup_arg); + } + DEBUG0("Freeing arguments"); for(i=0;iargc; i++) if(context->argv[i]) @@ -128,29 +153,25 @@ static void __context_exit(xbt_context_t context ,int value) if(context->argv) free(context->argv); - - if(context->cleanup_func){ - DEBUG0("Calling cleanup function"); - context->cleanup_func(context->cleanup_arg); - } - + DEBUG0("Putting context in the to_destroy set"); xbt_swag_remove(context, context_living); xbt_swag_insert(context, context_to_destroy); DEBUG0("Context put in the to_destroy set"); + DEBUG0("Yielding"); #ifdef CONTEXT_THREADS - DEBUG0("**** Locking ****"); + DEBUG1("[%p] **** Locking ****", context); xbt_mutex_lock(context->mutex); - DEBUG0("**** Updating current_context ****"); - current_context = context; - DEBUG0("**** Releasing the prisonner ****"); +/* DEBUG1("[%p] **** Updating current_context ****"); */ +/* current_context = context; */ + DEBUG1("[%p] **** Releasing the prisonner ****", context); xbt_thcond_signal(context->cond); - DEBUG0("**** Unlocking ****"); + DEBUG1("[%p] **** Unlocking ****", context); xbt_mutex_unlock(context->mutex); - DEBUG0("**** Exiting ****"); - xbt_thread_exit(0); + DEBUG1("[%p] **** Exiting ****", context); + xbt_thread_exit(NULL); // We should provide return value in case other wants it #else __xbt_context_yield(context); #endif @@ -165,12 +186,14 @@ __context_wrapper(void* c) { context->thread = xbt_thread_self(); DEBUG2("**[%p:%p]** Lock ****",context,(void*)xbt_thread_self()); - xbt_mutex_lock(context->mutex); + xbt_mutex_lock(creation_mutex); - DEBUG2("**[%p:%p]** Releasing the prisonner ****",context,(void*)xbt_thread_self()); - xbt_thcond_signal(context->cond); + DEBUG2("**[%p:%p]** Releasing the creator ****",context,(void*)xbt_thread_self()); + xbt_thcond_signal(creation_cond); + xbt_mutex_unlock(creation_mutex); DEBUG2("**[%p:%p]** Going to Jail ****",context,(void*)xbt_thread_self()); + xbt_mutex_lock(context->mutex); xbt_thcond_wait(context->cond, context->mutex); DEBUG2("**[%p:%p]** Unlocking ****",context,(void*)xbt_thread_self()); @@ -227,6 +250,10 @@ void xbt_context_init(void) context_to_destroy = xbt_swag_new(xbt_swag_offset(*current_context,hookup)); context_living = xbt_swag_new(xbt_swag_offset(*current_context,hookup)); xbt_swag_insert(init_context, context_living); +#ifdef CONTEXT_THREADS + creation_mutex = xbt_mutex_init(); + creation_cond = xbt_thcond_init(); +#endif } } @@ -238,7 +265,8 @@ void xbt_context_init(void) void xbt_context_empty_trash(void) { xbt_context_t context=NULL; - DEBUG0("Emptying trashbin"); + DEBUG1("Emptying trashbin (%d contexts to free)", + xbt_swag_size(context_to_destroy)); while((context=xbt_swag_extract(context_to_destroy))) xbt_context_free(context); } @@ -254,16 +282,16 @@ void xbt_context_start(xbt_context_t context) #ifdef CONTEXT_THREADS /* Launch the thread */ DEBUG1("**[%p]** Locking ****",context); - xbt_mutex_lock(context->mutex); + xbt_mutex_lock(creation_mutex); DEBUG1("**[%p]** Thread create ****",context); context->thread = xbt_thread_create(__context_wrapper, context); DEBUG2("**[%p]** Thread created : %p ****",context,context->thread); DEBUG1("**[%p]** Going to jail ****",context); - xbt_thcond_wait(context->cond, context->mutex); + xbt_thcond_wait(creation_cond, creation_mutex); DEBUG1("**[%p]** Unlocking ****",context); - xbt_mutex_unlock(context->mutex); + xbt_mutex_unlock(creation_mutex); #else makecontext (&(context->uc), (void (*) (void)) __context_wrapper,1, context); #endif @@ -295,7 +323,7 @@ xbt_context_t xbt_context_new(xbt_context_function_t code, res->mutex = xbt_mutex_init(); res->cond = xbt_thcond_init(); #else - /* FIXME: strerror is not thread safe */ + xbt_assert2(getcontext(&(res->uc))==0,"Error in context saving: %d (%s)", errno, strerror(errno)); res->uc.uc_link = NULL; /* res->uc.uc_link = &(current_context->uc); */ @@ -350,17 +378,24 @@ void xbt_context_schedule(xbt_context_t context) */ void xbt_context_exit(void) { xbt_context_t context=NULL; - - xbt_context_empty_trash(); - xbt_swag_free(context_to_destroy); + xbt_context_empty_trash(); while((context=xbt_swag_extract(context_living))) { - if(context!=init_context) xbt_context_kill(context); + if(context!=init_context) { + xbt_context_kill(context); + } } - xbt_context_kill(init_context); + // xbt_context_kill(init_context); + + xbt_context_empty_trash(); + xbt_swag_free(context_to_destroy); xbt_swag_free(context_living); init_context = current_context = NULL ; +#ifdef CONTEXT_THREADS + xbt_mutex_destroy(creation_mutex); + xbt_thcond_destroy(creation_cond); +#endif } /** @@ -370,26 +405,12 @@ void xbt_context_exit(void) { */ void xbt_context_kill(xbt_context_t context) { - int i ; - DEBUG1("Killing %p", context); - - xbt_swag_remove(context, context_living); - - if(context->cleanup_func) { - DEBUG1("Calling cleanup function %p", context->cleanup_func); - context->cleanup_func(context->cleanup_arg); - } - DEBUG0("Freeing arguments"); - for(i=0;iargc; i++) - if(context->argv[i]) - free(context->argv[i]); - - if(context->argv) - free(context->argv); - - xbt_context_free(context); + context->iwannadie=1; + DEBUG1("Scheduling %p",context); + __xbt_context_yield(context); + DEBUG1("End of Scheduling %p",context); return; }