X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1e5dedb10f6023f6061ad6e757794a673b585b0..3f9587e71330e7471ef675d2652cee260a0e3a96:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 7449725ce2..6208210e1d 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -9,7 +9,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/internal_config.h" -#ifdef HAVE_PTHREAD_SETAFFINITY +#if HAVE_PTHREAD_SETAFFINITY #define _GNU_SOURCE #include #endif @@ -25,7 +25,8 @@ #include #include -#if defined(WIN32) +#if defined(_WIN32) +#include #elif defined(__MACH__) && defined(__APPLE__) #include #include @@ -36,17 +37,15 @@ #include "xbt/sysdep.h" #include "xbt/ex.h" -#include "src/xbt/ex_interface.h" /* We play crude games with exceptions */ -#include "src/portable.h" +#include "src/internal_config.h" #include "xbt/xbt_os_time.h" /* Portable time facilities */ #include "xbt/xbt_os_thread.h" /* This module */ #include "src/xbt_modinter.h" /* Initialization/finalization of this module */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)"); - -/* use named sempahore when sem_init() does not work */ -#ifndef HAVE_SEM_INIT +/* use named semaphore when sem_init() does not work */ +#if !HAVE_SEM_INIT static int next_sem_ID = 0; static xbt_os_mutex_t next_sem_ID_lock; #endif @@ -57,7 +56,6 @@ typedef struct xbt_os_thread_ { char *name; void *param; pvoid_f_pvoid_t start_routine; - xbt_running_ctx_t *running_ctx; void *extra_data; } s_xbt_os_thread_t; static xbt_os_thread_t main_thread = NULL; @@ -75,18 +73,10 @@ static void xbt_os_thread_free_thread_data(xbt_os_thread_t thread) { if (thread == main_thread) /* just killed main thread */ main_thread = NULL; - - free(thread->running_ctx); free(thread->name); free(thread); } -/* callback: context fetching */ -static xbt_running_ctx_t *_os_thread_get_running_ctx(void) -{ - return xbt_os_thread_self()->running_ctx; -} - /* callback: termination */ static void _os_thread_ex_terminate(xbt_ex_t * e) { @@ -109,22 +99,17 @@ void xbt_os_thread_mod_preinit(void) main_thread->name = (char *) "main"; main_thread->param = NULL; main_thread->start_routine = NULL; - main_thread->running_ctx = xbt_new(xbt_running_ctx_t, 1); main_thread->extra_data = NULL; - XBT_RUNNING_CTX_INITIALIZE(main_thread->running_ctx); if ((errcode = pthread_setspecific(xbt_self_thread_key, main_thread))) THROWF(system_error, errcode, "Impossible to set the SimGrid identity descriptor to the main thread (pthread_setspecific failed)"); - - __xbt_running_ctx_fetch = _os_thread_get_running_ctx; - __xbt_ex_terminate = _os_thread_ex_terminate; pthread_attr_init(&thread_attr); thread_mod_inited = 1; -#ifndef HAVE_SEM_INIT +#if !HAVE_SEM_INIT next_sem_ID_lock = xbt_os_mutex_init(); #endif } @@ -137,19 +122,21 @@ void xbt_os_thread_mod_postexit(void) // if ((errcode=pthread_key_delete(xbt_self_thread_key))) // THROWF(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key"); - free(main_thread->running_ctx); free(main_thread); main_thread = NULL; thread_mod_inited = 0; -#ifndef HAVE_SEM_INIT +#if !HAVE_SEM_INIT xbt_os_mutex_destroy(next_sem_ID_lock); #endif - - /* Restore the default exception setup */ - __xbt_running_ctx_fetch = &__xbt_ex_ctx_default; - __xbt_ex_terminate = &__xbt_ex_terminate_default; } +/** Calls pthread_atfork() if present, and raise an exception otherwise. + * + * The only known user of this wrapper is mmalloc_preinit(), but it is absolutely mandatory there: + * when used with tesh, mmalloc *must* be mutex protected and resistant to forks. + * This functionality is the only way to get it working (by ensuring that the mutex is consistently released on forks) + */ + /* this function is critical to tesh+mmalloc, don't mess with it */ int xbt_os_thread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) { @@ -169,7 +156,6 @@ static void *wrapper_start_routine(void *s) return res; } - xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, void *extra_data) { xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1); @@ -177,8 +163,6 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_ro res_thread->name = xbt_strdup(name); res_thread->start_routine = start_routine; res_thread->param = param; - 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; int errcode = pthread_create(&(res_thread->t), &thread_attr, wrapper_start_routine, res_thread); @@ -187,9 +171,13 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_ro return res_thread; } +/** Bind the thread to the given core, if possible. + * + * If pthread_setaffinity_np is not usable on that (non-gnu) platform, this function does nothing. + */ int xbt_os_thread_bind(xbt_os_thread_t thread, int cpu){ int errcode = 0; -#ifdef HAVE_PTHREAD_SETAFFINITY +#if HAVE_PTHREAD_SETAFFINITY pthread_t pthread = thread->t; cpu_set_t cpuset; CPU_ZERO(&cpuset); @@ -243,11 +231,6 @@ void xbt_os_thread_setguardsize(int guard_size) #endif } -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 me = xbt_os_thread_self(); @@ -267,7 +250,7 @@ void xbt_os_thread_exit(int *retval) pthread_exit(retval); } -xbt_os_thread_t xbt_os_thread_self(void) +xbt_os_thread_t xbt_os_thread_self(void ) { if (!thread_mod_inited) return NULL; @@ -281,13 +264,14 @@ void xbt_os_thread_key_create(xbt_os_thread_key_t* key) xbt_assert(errcode==0 , "pthread_key_create failed"); } -void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) { - +void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) +{ int errcode = pthread_setspecific(key, value); xbt_assert(errcode==0, "pthread_setspecific failed"); } -void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) { +void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) +{ return pthread_getspecific(key); } @@ -310,7 +294,6 @@ void xbt_os_thread_cancel(xbt_os_thread_t t) /****** mutex related functions ******/ typedef struct xbt_os_mutex_ { - /* KEEP IT IN SYNC WITH xbt_thread.c */ pthread_mutex_t m; } s_xbt_os_mutex_t; @@ -319,8 +302,12 @@ typedef struct xbt_os_mutex_ { xbt_os_mutex_t xbt_os_mutex_init(void) { + pthread_mutexattr_t Attr; + pthread_mutexattr_init(&Attr); + pthread_mutexattr_settype(&Attr, PTHREAD_MUTEX_RECURSIVE); + xbt_os_mutex_t res = xbt_new(s_xbt_os_mutex_t, 1); - int errcode = pthread_mutex_init(&(res->m), NULL); + int errcode = pthread_mutex_init(&(res->m), &Attr); xbt_assert(errcode==0, "pthread_mutex_init() failed: %s", strerror(errcode)); return res; @@ -350,7 +337,6 @@ void xbt_os_mutex_destroy(xbt_os_mutex_t mutex) /***** condition related functions *****/ typedef struct xbt_os_cond_ { - /* KEEP IT IN SYNC WITH xbt_thread.c */ pthread_cond_t c; } s_xbt_os_cond_t; @@ -368,32 +354,6 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) xbt_assert(errcode==0, "pthread_cond_wait(%p,%p) failed: %s", cond, mutex, strerror(errcode)); } - -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(); - - if (delay < 0) { - xbt_os_cond_wait(cond, mutex); - } else { - ts_end.tv_sec = (time_t) floor(end); - ts_end.tv_nsec = (long) ((end - ts_end.tv_sec) * 1000000000); - XBT_DEBUG("pthread_cond_timedwait(%p,%p,%p)", &(cond->c), &(mutex->m), &ts_end); - switch ((errcode = pthread_cond_timedwait(&(cond->c), &(mutex->m), &ts_end))) { - case 0: - return; - case ETIMEDOUT: - THROWF(timeout_error, errcode, - "condition %p (mutex %p) wasn't signaled before timeout (%f)", - cond, mutex, delay); - default: - THROWF(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 = pthread_cond_signal(&(cond->c)); @@ -417,7 +377,7 @@ void xbt_os_cond_destroy(xbt_os_cond_t cond) } typedef struct xbt_os_sem_ { -#ifndef HAVE_SEM_INIT +#if !HAVE_SEM_INIT char *name; #endif sem_t s; @@ -436,7 +396,7 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) * Any attempt to use it leads to ENOSYS (function not implemented). * If such a prehistoric system is detected, do the job with sem_open instead */ -#ifdef HAVE_SEM_INIT +#if HAVE_SEM_INIT if (sem_init(&(res->s), 0, value) != 0) THROWF(system_error, errno, "sem_init() failed: %s", strerror(errno)); res->ps = &(res->s); @@ -480,27 +440,17 @@ void xbt_os_sem_release(xbt_os_sem_t sem) void xbt_os_sem_destroy(xbt_os_sem_t sem) { -#ifdef HAVE_SEM_INIT +#if HAVE_SEM_INIT if (sem_destroy(sem->ps) < 0) - THROWF(system_error, errno, "sem_destroy() failed: %s", - strerror(errno)); + THROWF(system_error, errno, "sem_destroy() failed: %s", strerror(errno)); #else if (sem_close(sem->ps) < 0) THROWF(system_error, errno, "sem_close() failed: %s", strerror(errno)); xbt_free(sem->name); - #endif xbt_free(sem); } -void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue) -{ - if (sem_getvalue(&(sem->s), svalue) < 0) - THROWF(system_error, errno, "sem_getvalue() failed: %s", - strerror(errno)); -} - - /** @brief Returns the amount of cores on the current host */ int xbt_os_get_numcores(void) { #ifdef WIN32 @@ -536,59 +486,3 @@ void *xbt_os_thread_get_extra_data(void) xbt_os_thread_t thread = xbt_os_thread_self(); return thread ? thread->extra_data : NULL; } - -/***** reentrant mutexes *****/ -typedef struct xbt_os_rmutex_ { - xbt_os_mutex_t mutex; - xbt_os_thread_t owner; - int count; -} s_xbt_os_rmutex_t; - -xbt_os_rmutex_t xbt_os_rmutex_init(void) -{ - xbt_os_rmutex_t rmutex = xbt_new0(struct xbt_os_rmutex_, 1); - rmutex->mutex = xbt_os_mutex_init(); - rmutex->owner = NULL; - rmutex->count = 0; - return rmutex; -} - -void xbt_os_rmutex_acquire(xbt_os_rmutex_t rmutex) -{ - xbt_os_thread_t self = xbt_os_thread_self(); - - if (self == NULL) { - /* the thread module is not initialized yet */ - rmutex->owner = NULL; - return; - } - - if (self != rmutex->owner) { - xbt_os_mutex_acquire(rmutex->mutex); - rmutex->owner = self; - rmutex->count = 1; - } else { - rmutex->count++; - } -} - -void xbt_os_rmutex_release(xbt_os_rmutex_t rmutex) -{ - if (rmutex->owner == NULL) { - /* the thread module was not initialized */ - return; - } - - xbt_assert(rmutex->owner == xbt_os_thread_self()); - - if (--rmutex->count == 0) { - rmutex->owner = NULL; - xbt_os_mutex_release(rmutex->mutex); - } -} - -void xbt_os_rmutex_destroy(xbt_os_rmutex_t rmutex) -{ - xbt_os_mutex_destroy(rmutex->mutex); - xbt_free(rmutex); -}