X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c81b88b7af71898176fabb4177118edfc3a70c22..46bade924148e45d2fd389682cddc4c3eabdff96:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 73fe3a4fdc..dad3c66461 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -12,39 +12,71 @@ #include "xbt/sysdep.h" #include "xbt/ex.h" +#include "xbt/ex_interface.h" /* We play crude games with exceptions */ #include "portable.h" +#include "xbt/xbt_os_time.h" /* Portable time facilities */ #include "xbt/xbt_os_thread.h" /* This module */ #include "xbt_modinter.h" /* Initialization/finalization of this module */ - +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os,xbt,"Synchronization mechanism (OS-level)"); /* ********************************* PTHREAD IMPLEMENTATION ************************************ */ #ifdef HAVE_PTHREAD_H #include + typedef struct xbt_os_thread_ { - /* KEEP IT IN SYNC WITH xbt_thread.c */ pthread_t t; + char *name; void *param; pvoid_f_pvoid_t *start_routine; + ex_ctx_t *exception; } s_xbt_os_thread_t ; +static xbt_os_thread_t main_thread = NULL; /* thread-specific data containing the xbt_os_thread_t structure */ static pthread_key_t xbt_self_thread_key; +static int thread_mod_inited = 0; /* frees the xbt_os_thread_t corresponding to the current thread */ static void xbt_os_thread_free_thread_data(void*d){ free(d); } +/* callback: context fetching */ +static ex_ctx_t *_os_thread_ex_ctx(void) { + return xbt_os_thread_self()->exception; +} + +/* callback: termination */ +static void _os_thread_ex_terminate(xbt_ex_t * e) { + xbt_ex_display(e); + + abort(); + /* FIXME: there should be a configuration variable to choose to kill everyone or only this one */ +} + void xbt_os_thread_mod_init(void) { int errcode; + if (thread_mod_inited) + return; + if ((errcode=pthread_key_create(&xbt_self_thread_key, NULL))) THROW0(system_error,errcode,"pthread_key_create failed for xbt_self_thread_key"); + + main_thread=xbt_new(s_xbt_os_thread_t,1); + main_thread->name = (char*)"main"; + main_thread->start_routine = NULL; + main_thread->param = NULL; + main_thread->exception = xbt_new(ex_ctx_t, 1); + XBT_CTX_INITIALIZE(main_thread->exception); + + thread_mod_inited = 1; } void xbt_os_thread_mod_exit(void) { - /* FIXME: don't try to free our key on shutdown. Valgrind detects no leak if we don't, and whine if we try to */ + /* FIXME: don't try to free our key on shutdown. + Valgrind detects no leak if we don't, and whine if we try to */ // int errcode; // if ((errcode=pthread_key_delete(xbt_self_thread_key))) @@ -56,34 +88,53 @@ static void * wrapper_start_routine(void *s) { int errcode; if ((errcode=pthread_setspecific(xbt_self_thread_key,t))) - THROW0(system_error,errcode,"pthread_setspecific failed for xbt_self_thread_key"); + THROW0(system_error,errcode, + "pthread_setspecific failed for xbt_self_thread_key"); return t->start_routine(t->param); } - -xbt_os_thread_t xbt_os_thread_create(pvoid_f_pvoid_t start_routine, +xbt_os_thread_t xbt_os_thread_create(const char*name, + pvoid_f_pvoid_t start_routine, void* param) { int errcode; xbt_os_thread_t res_thread=xbt_new(s_xbt_os_thread_t,1); + res_thread->name = xbt_strdup(name); res_thread->start_routine = start_routine; res_thread->param = param; - + res_thread->exception = xbt_new(ex_ctx_t, 1); + XBT_CTX_INITIALIZE(res_thread->exception); - if ((errcode = pthread_create(&(res_thread->t), NULL, wrapper_start_routine, res_thread))) - THROW1(system_error,errcode, "pthread_create failed: %s",strerror(errcode)); + if ((errcode = pthread_create(&(res_thread->t), NULL, + wrapper_start_routine, res_thread))) + THROW1(system_error,errcode, + "pthread_create failed: %s",strerror(errcode)); return res_thread; } +const char* xbt_os_thread_name(xbt_os_thread_t t) { + return t->name; +} + +const char* xbt_os_thread_self_name(void) { + xbt_os_thread_t self = xbt_os_thread_self(); + return self?self->name:"main"; +} void xbt_os_thread_join(xbt_os_thread_t thread,void ** thread_return) { - int errcode; - - if ((errcode = pthread_join(thread->t,thread_return))) - THROW1(system_error,errcode, "pthread_join failed: %s", - strerror(errcode)); - free(thread); + int errcode; + + if ((errcode = pthread_join(thread->t,thread_return))) + THROW1(system_error,errcode, "pthread_join failed: %s", + strerror(errcode)); + if (thread->exception) + free(thread->exception); + + if (thread == main_thread) /* just killed main thread */ + main_thread = NULL; + + free(thread); } void xbt_os_thread_exit(int *retval) { @@ -91,13 +142,25 @@ void xbt_os_thread_exit(int *retval) { } xbt_os_thread_t xbt_os_thread_self(void) { - return pthread_getspecific(xbt_self_thread_key); + xbt_os_thread_t res; + + if (!thread_mod_inited) + return NULL; + + res = pthread_getspecific(xbt_self_thread_key); + if (!res) + res = main_thread; + + return res; } #include void xbt_os_thread_yield(void) { sched_yield(); } +void xbt_os_thread_cancel(xbt_os_thread_t t) { + pthread_cancel(t->t); +} /****** mutex related functions ******/ typedef struct xbt_os_mutex_ { /* KEEP IT IN SYNC WITH xbt_thread.c */ @@ -165,6 +228,25 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) { cond,mutex, strerror(errcode)); } +#include +#include +void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, double delay) { + int errcode; + struct timespec ts_end; + double end = delay + xbt_os_time(); + ts_end.tv_sec = (time_t) floor(end); + ts_end.tv_nsec = (long) ( ( end - ts_end.tv_sec) * 1000000000); + DEBUG3("pthread_cond_timedwait(%p,%p,%p)",&(cond->c),&(mutex->m), &ts_end); + switch ( (errcode=pthread_cond_timedwait(&(cond->c),&(mutex->m), &ts_end)) ) { + case ETIMEDOUT: + THROW3(timeout_error,errcode,"condition %p (mutex %p) wasn't signaled before timeout (%f)", + cond,mutex, delay); + default: + THROW4(system_error,errcode,"pthread_cond_timedwait(%p,%p,%f) failed: %s", + cond,mutex, delay, strerror(errcode)); + } +} + void xbt_os_cond_signal(xbt_os_cond_t cond) { int errcode; if ((errcode=pthread_cond_signal(&(cond->c)))) @@ -189,12 +271,17 @@ void xbt_os_cond_destroy(xbt_os_cond_t cond){ free(cond); } +void *xbt_os_thread_getparam(void) { + xbt_os_thread_t t = xbt_os_thread_self(); + return t?t->param:NULL; +} + /* ********************************* WINDOWS IMPLEMENTATION ************************************ */ #elif defined(WIN32) typedef struct xbt_os_thread_ { - /* KEEP IT IN SYNC WITH xbt_thread */ + char *name; HANDLE handle; /* the win thread handle */ unsigned long id; /* the win thread id */ pvoid_f_pvoid_t *start_routine; @@ -223,11 +310,12 @@ static DWORD WINAPI wrapper_start_routine(void *s) { } -xbt_os_thread_t xbt_os_thread_create(pvoid_f_pvoid_t start_routine, +xbt_os_thread_t xbt_os_thread_create(const char *name,pvoid_f_pvoid_t start_routine, void* param) { xbt_os_thread_t t = xbt_new(s_xbt_os_thread_t,1); + t->name = xbt_strdup(name); t->start_routine = start_routine ; t->param = param; @@ -243,6 +331,15 @@ xbt_os_thread_t xbt_os_thread_create(pvoid_f_pvoid_t start_routine, return t; } +const char* xbt_os_thread_name(xbt_os_thread_t t) { + return t->name; +} + +const char* xbt_os_thread_self_name(void) { + xbt_os_thread_t t = xbt_os_thread_self(); + return t?t->name:"main"; +} + void xbt_os_thread_join(xbt_os_thread_t thread,void ** thread_return) { @@ -256,6 +353,7 @@ xbt_os_thread_join(xbt_os_thread_t thread,void ** thread_return) { } CloseHandle(thread->handle); + free(thread->name); free(thread); } @@ -270,9 +368,18 @@ xbt_os_thread_t xbt_os_thread_self(void) { return TlsGetValue(xbt_self_thread_key); } +void *xbt_os_thread_getparam(void) { + xbt_os_thread_t t = xbt_os_thread_self(); + return t->param; +} + + void xbt_os_thread_yield(void) { Sleep(0); } +void xbt_os_thread_cancel(xbt_os_thread_t t) { + THROW_UNIMPLEMENTED; +} /****** mutex related functions ******/ typedef struct xbt_os_mutex_ { @@ -396,6 +503,9 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) { /* relock the mutex associated with the condition in accordance with the posix thread specification */ EnterCriticalSection (& mutex->lock); } +void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, double delay) { + THROW_UNIMPLEMENTED; +} void xbt_os_cond_signal(xbt_os_cond_t cond) { int have_waiters;