X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88e507ca6ecc4ca606c87dcbdb22dd9baea37b4c..62f7f34fa9c49f6480ac7c6e0add279cdadba324:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 10f8266ee2..a04779da6a 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -8,6 +8,7 @@ /* 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. */ +#include "gras_config.h" #include "xbt/sysdep.h" #include "xbt/ex.h" #include "xbt/ex_interface.h" /* We play crude games with exceptions */ @@ -43,7 +44,8 @@ typedef struct xbt_os_thread_ { char *name; void *param; pvoid_f_pvoid_t start_routine; - ex_ctx_t *exception; + xbt_running_ctx_t *running_ctx; + void *extra_data; } s_xbt_os_thread_t; static xbt_os_thread_t main_thread = NULL; @@ -58,9 +60,9 @@ static void xbt_os_thread_free_thread_data(void *d) } /* callback: context fetching */ -static ex_ctx_t *_os_thread_ex_ctx(void) +static xbt_running_ctx_t *_os_thread_get_running_ctx(void) { - return xbt_os_thread_self()->exception; + return xbt_os_thread_self()->running_ctx; } /* callback: termination */ @@ -82,15 +84,20 @@ void xbt_os_thread_mod_preinit(void) 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); + main_thread->running_ctx = xbt_new(xbt_running_ctx_t, 1); + XBT_RUNNING_CTX_INITIALIZE(main_thread->running_ctx); - __xbt_ex_ctx = _os_thread_ex_ctx; + if ((errcode = pthread_setspecific(xbt_self_thread_key, main_thread))) + THROW0(system_error, errcode, + "pthread_setspecific failed for xbt_self_thread_key"); + + + __xbt_running_ctx_fetch = _os_thread_get_running_ctx; __xbt_ex_terminate = _os_thread_ex_terminate; thread_mod_inited = 1; @@ -109,7 +116,7 @@ void xbt_os_thread_mod_postexit(void) // if ((errcode=pthread_key_delete(xbt_self_thread_key))) // THROW0(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key"); - free(main_thread->exception); + free(main_thread->running_ctx); free(main_thread); main_thread = NULL; thread_mod_inited = 0; @@ -118,7 +125,7 @@ void xbt_os_thread_mod_postexit(void) #endif /* Restore the default exception setup */ - __xbt_ex_ctx = &__xbt_ex_ctx_default; + __xbt_running_ctx_fetch = &__xbt_ex_ctx_default; __xbt_ex_terminate = &__xbt_ex_terminate_default; } @@ -142,7 +149,8 @@ static void *wrapper_start_routine(void *s) xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, - void *param) + void *param, + void *extra_data) { int errcode; @@ -150,9 +158,10 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, 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); - + res_thread->running_ctx = xbt_new(xbt_running_ctx_t, 1); + XBT_RUNNING_CTX_INITIALIZE(res_thread->running_ctx); + res_thread->extra_data = extra_data; + if ((errcode = pthread_create(&(res_thread->t), NULL, wrapper_start_routine, res_thread))) THROW1(system_error, errcode, @@ -172,6 +181,16 @@ const char *xbt_os_thread_self_name(void) return me ? me->name : "main"; } +void xbt_os_thread_set_extra_data(void *data) +{ + xbt_os_thread_self()->extra_data = data; +} + +void *xbt_os_thread_get_extra_data(void) +{ + return xbt_os_thread_self()->extra_data; +} + void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return) { @@ -180,8 +199,8 @@ void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return) 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->running_ctx) + free(thread->running_ctx); if (thread->name) free(thread->name); @@ -205,12 +224,15 @@ xbt_os_thread_t xbt_os_thread_self(void) return NULL; res = pthread_getspecific(xbt_self_thread_key); - if (!res) - res = main_thread; return res; } +void xbt_os_thread_detach(xbt_os_thread_t thread) +{ + pthread_detach(thread->t); +} + #include void xbt_os_thread_yield(void) { @@ -457,7 +479,7 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) #else /* damn, no sem_init(). Reimplement it */ xbt_os_mutex_acquire(next_sem_ID_lock); - res->name = bprintf("/%d.%d", (*xbt_getpid) (), ++next_sem_ID); + res->name = bprintf("/%d", ++next_sem_ID); xbt_os_mutex_release(next_sem_ID_lock); res->ps = sem_open(res->name, O_CREAT, 0644, value); @@ -598,6 +620,7 @@ typedef struct xbt_os_thread_ { unsigned long id; /* the win thread id */ pvoid_f_pvoid_t start_routine; void *param; + void *extra_data; } s_xbt_os_thread_t; /* so we can specify the size of the stack of the threads */ @@ -648,7 +671,8 @@ static DWORD WINAPI wrapper_start_routine(void *s) xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, - void *param) + void *param, + void *extra_data) { xbt_os_thread_t t = xbt_new(s_xbt_os_thread_t, 1); @@ -656,7 +680,7 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, t->name = xbt_strdup(name); t->start_routine = start_routine; t->param = param; - + t->extra_data = extra_data; t->handle = CreateThread(NULL, XBT_DEFAULT_THREAD_STACK_SIZE, (LPTHREAD_START_ROUTINE) wrapper_start_routine, t, STACK_SIZE_PARAM_IS_A_RESERVATION, &(t->id)); @@ -710,6 +734,12 @@ void xbt_os_thread_exit(int *retval) ExitThread(0); } +void xbt_os_thread_detach(xbt_os_thread_t thread) +{ + THROW_UNIMPLEMENTED; +} + + xbt_os_thread_t xbt_os_thread_self(void) { return TlsGetValue(xbt_self_thread_key);