X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..f9a6652301a5b9708bd74a7fc7e9ae57f26d36f8:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index f827c4a52e..08e82d5563 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -1,15 +1,14 @@ -/* $Id$ */ - /* xbt_os_thread -- portability layer over the pthread API */ /* Used in RL to get win/lin portability, and in SG when CONTEXT_THREAD */ /* in SG, when using CONTEXT_UCONTEXT, xbt_os_thread_stub is used instead */ -/* Copyright 2006,2007 Malek Cherier, Martin Quinson - * All right reserved. */ +/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* 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 */ @@ -24,7 +23,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, /* ********************************* PTHREAD IMPLEMENTATION ************************************ */ #ifdef HAVE_PTHREAD_H -#include #include #ifdef HAVE_MUTEX_TIMEDLOCK @@ -42,10 +40,12 @@ static xbt_os_mutex_t next_sem_ID_lock; typedef struct xbt_os_thread_ { pthread_t t; + int detached; 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; @@ -54,27 +54,31 @@ 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) +static void xbt_os_thread_free_thread_data(xbt_os_thread_t thread) { - free(d); + if (thread == main_thread) /* just killed main thread */ + main_thread = NULL; + + free(thread->running_ctx); + free(thread->name); + free(thread); } /* 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 */ static void _os_thread_ex_terminate(xbt_ex_t * e) { xbt_ex_display(e); - - abort(); + xbt_abort(); /* FIXME: there should be a configuration variable to choose to kill everyone or only this one */ } -void xbt_os_thread_mod_init(void) +void xbt_os_thread_mod_preinit(void) { int errcode; @@ -82,42 +86,62 @@ void xbt_os_thread_mod_init(void) return; if ((errcode = pthread_key_create(&xbt_self_thread_key, NULL))) - THROW0(system_error, errcode, + THROWF(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))) + THROWF(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; -#ifndef HAVE_SEM_WAIT +#ifndef HAVE_SEM_INIT next_sem_ID_lock = xbt_os_mutex_init(); #endif } -void xbt_os_thread_mod_exit(void) +void xbt_os_thread_mod_postexit(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 */ // int errcode; // 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); + // 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_WAIT +#ifndef 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; +} + +/* 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)) +{ +#ifdef WIN32 + THROW_UNIMPLEMENTED; //pthread_atfork is not implemented in pthread.h on windows +#else + return pthread_atfork(prepare, parent, child); +#endif } static void *wrapper_start_routine(void *s) @@ -126,28 +150,34 @@ static void *wrapper_start_routine(void *s) int errcode; if ((errcode = pthread_setspecific(xbt_self_thread_key, t))) - THROW0(system_error, errcode, + THROWF(system_error, errcode, "pthread_setspecific failed for xbt_self_thread_key"); - return (*(t->start_routine)) (t->param); + void *res = t->start_routine(t->param); + if (t->detached) + xbt_os_thread_free_thread_data(t); + return res; } 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; xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1); + res_thread->detached = 0; 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, + THROWF(system_error, errcode, "pthread_create failed: %s", strerror(errcode)); return res_thread; @@ -160,8 +190,8 @@ const char *xbt_os_thread_name(xbt_os_thread_t t) const char *xbt_os_thread_self_name(void) { - xbt_os_thread_t self = xbt_os_thread_self(); - return self ? self->name : "main"; + xbt_os_thread_t me = xbt_os_thread_self(); + return me ? me->name : "main"; } void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return) @@ -170,18 +200,9 @@ 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", + THROWF(system_error, errcode, "pthread_join failed: %s", strerror(errcode)); - if (thread->exception) - free(thread->exception); - - if (thread->name) - free(thread->name); - - if (thread == main_thread) /* just killed main thread */ - main_thread = NULL; - - free(thread); + xbt_os_thread_free_thread_data(thread); } void xbt_os_thread_exit(int *retval) @@ -197,12 +218,34 @@ 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_key_create(xbt_os_thread_key_t* key) { + + int errcode; + if ((errcode = pthread_key_create(key, NULL))) + THROWF(system_error, errcode, "pthread_key_create failed"); +} + +void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) { + + int errcode; + if ((errcode = pthread_setspecific(key, value))) + THROWF(system_error, errcode, "pthread_setspecific failed"); +} + +void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) { + return pthread_getspecific(key); +} + +void xbt_os_thread_detach(xbt_os_thread_t thread) +{ + thread->detached = 1; + pthread_detach(thread->t); +} + #include void xbt_os_thread_yield(void) { @@ -229,7 +272,7 @@ xbt_os_mutex_t xbt_os_mutex_init(void) int errcode; if ((errcode = pthread_mutex_init(&(res->m), NULL))) - THROW1(system_error, errcode, "pthread_mutex_init() failed: %s", + THROWF(system_error, errcode, "pthread_mutex_init() failed: %s", strerror(errcode)); return res; @@ -240,7 +283,7 @@ void xbt_os_mutex_acquire(xbt_os_mutex_t mutex) int errcode; if ((errcode = pthread_mutex_lock(&(mutex->m)))) - THROW2(system_error, errcode, "pthread_mutex_lock(%p) failed: %s", + THROWF(system_error, errcode, "pthread_mutex_lock(%p) failed: %s", mutex, strerror(errcode)); } @@ -259,10 +302,11 @@ void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) case 0: return; case ETIMEDOUT: - THROW1(timeout_error, 0, "mutex %p not ready", mutex); + THROWF(timeout_error, 0, "mutex %p not ready", mutex); default: - THROW2(system_error, errcode, "xbt_mutex_timedacquire(%p) failed: %s", - mutex, strerror(errcode)); + THROWF(system_error, errcode, + "xbt_mutex_timedacquire(%p) failed: %s", mutex, + strerror(errcode)); } @@ -274,11 +318,11 @@ void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) ts_end.tv_sec = (time_t) floor(end); ts_end.tv_nsec = (long) ((end - ts_end.tv_sec) * 1000000000); - DEBUG2("pthread_mutex_timedlock(%p,%p)", &(mutex->m), &ts_end); + XBT_DEBUG("pthread_mutex_timedlock(%p,%p)", &(mutex->m), &ts_end); errcode = pthread_mutex_timedlock(&(mutex->m), &ts_end); -#else /* Well, let's reimplement it since those lazy libc dudes didn't */ +#else /* Well, let's reimplement it since those lazy libc dudes didn't */ double start = xbt_os_time(); do { errcode = pthread_mutex_trylock(&(mutex->m)); @@ -289,18 +333,18 @@ void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) if (errcode == EBUSY) errcode = ETIMEDOUT; -#endif /* HAVE_MUTEX_TIMEDLOCK */ +#endif /* HAVE_MUTEX_TIMEDLOCK */ switch (errcode) { case 0: return; case ETIMEDOUT: - THROW2(timeout_error, delay, + THROWF(timeout_error, delay, "mutex %p wasn't signaled before timeout (%f)", mutex, delay); default: - THROW3(system_error, errcode, + THROWF(system_error, errcode, "pthread_mutex_timedlock(%p,%f) failed: %s", mutex, delay, strerror(errcode)); } @@ -312,7 +356,7 @@ void xbt_os_mutex_release(xbt_os_mutex_t mutex) int errcode; if ((errcode = pthread_mutex_unlock(&(mutex->m)))) - THROW2(system_error, errcode, "pthread_mutex_unlock(%p) failed: %s", + THROWF(system_error, errcode, "pthread_mutex_unlock(%p) failed: %s", mutex, strerror(errcode)); } @@ -324,7 +368,7 @@ void xbt_os_mutex_destroy(xbt_os_mutex_t mutex) return; if ((errcode = pthread_mutex_destroy(&(mutex->m)))) - THROW2(system_error, errcode, "pthread_mutex_destroy(%p) failed: %s", + THROWF(system_error, errcode, "pthread_mutex_destroy(%p) failed: %s", mutex, strerror(errcode)); free(mutex); } @@ -340,7 +384,7 @@ xbt_os_cond_t xbt_os_cond_init(void) xbt_os_cond_t res = xbt_new(s_xbt_os_cond_t, 1); int errcode; if ((errcode = pthread_cond_init(&(res->c), NULL))) - THROW1(system_error, errcode, "pthread_cond_init() failed: %s", + THROWF(system_error, errcode, "pthread_cond_init() failed: %s", strerror(errcode)); return res; @@ -350,7 +394,7 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) { int errcode; if ((errcode = pthread_cond_wait(&(cond->c), &(mutex->m)))) - THROW3(system_error, errcode, "pthread_cond_wait(%p,%p) failed: %s", + THROWF(system_error, errcode, "pthread_cond_wait(%p,%p) failed: %s", cond, mutex, strerror(errcode)); } @@ -367,18 +411,18 @@ void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, } else { 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), + 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: - THROW3(timeout_error, errcode, + THROWF(timeout_error, errcode, "condition %p (mutex %p) wasn't signaled before timeout (%f)", cond, mutex, delay); default: - THROW4(system_error, errcode, + THROWF(system_error, errcode, "pthread_cond_timedwait(%p,%p,%f) failed: %s", cond, mutex, delay, strerror(errcode)); } @@ -389,7 +433,7 @@ void xbt_os_cond_signal(xbt_os_cond_t cond) { int errcode; if ((errcode = pthread_cond_signal(&(cond->c)))) - THROW2(system_error, errcode, "pthread_cond_signal(%p) failed: %s", + THROWF(system_error, errcode, "pthread_cond_signal(%p) failed: %s", cond, strerror(errcode)); } @@ -397,7 +441,7 @@ void xbt_os_cond_broadcast(xbt_os_cond_t cond) { int errcode; if ((errcode = pthread_cond_broadcast(&(cond->c)))) - THROW2(system_error, errcode, "pthread_cond_broadcast(%p) failed: %s", + THROWF(system_error, errcode, "pthread_cond_broadcast(%p) failed: %s", cond, strerror(errcode)); } @@ -409,7 +453,7 @@ void xbt_os_cond_destroy(xbt_os_cond_t cond) return; if ((errcode = pthread_cond_destroy(&(cond->c)))) - THROW2(system_error, errcode, "pthread_cond_destroy(%p) failed: %s", + THROWF(system_error, errcode, "pthread_cond_destroy(%p) failed: %s", cond, strerror(errcode)); free(cond); } @@ -442,27 +486,28 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) */ #ifdef HAVE_SEM_INIT if (sem_init(&(res->s), 0, value) != 0) - THROW1(system_error, errno, "sem_init() failed: %s", strerror(errno)); + THROWF(system_error, errno, "sem_init() failed: %s", strerror(errno)); res->ps = &(res->s); -#else /* damn, no sem_init(). Reimplement it */ +#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); if ((res->ps == (sem_t *) SEM_FAILED) && (errno == ENAMETOOLONG)) { /* Old darwins only allow 13 chars. Did you create *that* amount of semaphores? */ res->name[13] = '\0'; - res->ps = sem_open(res->name, O_CREAT, 0644, 1); + res->ps = sem_open(res->name, O_CREAT, 0644, value); } if ((res->ps == (sem_t *) SEM_FAILED)) - THROW1(system_error, errno, "sem_open() failed: %s", strerror(errno)); + THROWF(system_error, errno, "sem_open() failed: %s", strerror(errno)); /* Remove the name from the semaphore namespace: we never join on it */ if (sem_unlink(res->name) < 0) - THROW1(system_error, errno, "sem_unlink() failed: %s", strerror(errno)); + THROWF(system_error, errno, "sem_unlink() failed: %s", + strerror(errno)); #endif @@ -472,9 +517,9 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) void xbt_os_sem_acquire(xbt_os_sem_t sem) { if (!sem) - THROW0(arg_error, EINVAL, "Cannot acquire of the NULL semaphore"); + THROWF(arg_error, EINVAL, "Cannot acquire of the NULL semaphore"); if (sem_wait(sem->ps) < 0) - THROW1(system_error, errno, "sem_wait() failed: %s", strerror(errno)); + THROWF(system_error, errno, "sem_wait() failed: %s", strerror(errno)); } void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay) @@ -482,7 +527,7 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay) int errcode; if (!sem) - THROW0(arg_error, EINVAL, "Cannot acquire of the NULL semaphore"); + THROWF(arg_error, EINVAL, "Cannot acquire of the NULL semaphore"); if (delay < 0) { xbt_os_sem_acquire(sem); @@ -493,10 +538,11 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay) case 0: return; case ETIMEDOUT: - THROW1(timeout_error, 0, "semaphore %p not ready", sem); + THROWF(timeout_error, 0, "semaphore %p not ready", sem); default: - THROW2(system_error, errcode, "xbt_os_sem_timedacquire(%p) failed: %s", - sem, strerror(errcode)); + THROWF(system_error, errcode, + "xbt_os_sem_timedacquire(%p) failed: %s", sem, + strerror(errcode)); } } else { @@ -506,10 +552,10 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay) ts_end.tv_sec = (time_t) floor(end); ts_end.tv_nsec = (long) ((end - ts_end.tv_sec) * 1000000000); - DEBUG2("sem_timedwait(%p,%p)", sem->ps, &ts_end); + XBT_DEBUG("sem_timedwait(%p,%p)", sem->ps, &ts_end); errcode = sem_timedwait(sem->s, &ts_end); -#else /* Okay, reimplement this function then */ +#else /* Okay, reimplement this function then */ double start = xbt_os_time(); do { errcode = sem_trywait(sem->ps); @@ -526,11 +572,12 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay) return; case ETIMEDOUT: - THROW2(timeout_error, delay, - "semaphore %p wasn't signaled before timeout (%f)", sem, delay); + THROWF(timeout_error, delay, + "semaphore %p wasn't signaled before timeout (%f)", sem, + delay); default: - THROW3(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", sem, + THROWF(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", sem, delay, strerror(errcode)); } } @@ -539,25 +586,24 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay) void xbt_os_sem_release(xbt_os_sem_t sem) { if (!sem) - THROW0(arg_error, EINVAL, "Cannot release of the NULL semaphore"); + THROWF(arg_error, EINVAL, "Cannot release of the NULL semaphore"); if (sem_post(sem->ps) < 0) - THROW1(system_error, errno, "sem_post() failed: %s", strerror(errno)); + THROWF(system_error, errno, "sem_post() failed: %s", strerror(errno)); } void xbt_os_sem_destroy(xbt_os_sem_t sem) { if (!sem) - THROW0(arg_error, EINVAL, "Cannot destroy the NULL sempahore"); + THROWF(arg_error, EINVAL, "Cannot destroy the NULL sempahore"); #ifdef HAVE_SEM_INIT - if (sem_destroy(sem->ps)) - <0) - THROW1(system_error, errno, "sem_destroy() failed: %s", - strerror(errno)); + if (sem_destroy(sem->ps) < 0) + THROWF(system_error, errno, "sem_destroy() failed: %s", + strerror(errno)); #else if (sem_close(sem->ps) < 0) - THROW1(system_error, errno, "sem_close() failed: %s", strerror(errno)); + THROWF(system_error, errno, "sem_close() failed: %s", strerror(errno)); xbt_free(sem->name); #endif @@ -567,15 +613,17 @@ void xbt_os_sem_destroy(xbt_os_sem_t sem) void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue) { if (!sem) - THROW0(arg_error, EINVAL, "Cannot get the value of the NULL semaphore"); + THROWF(arg_error, EINVAL, + "Cannot get the value of the NULL semaphore"); if (sem_getvalue(&(sem->s), svalue) < 0) - THROW1(system_error, errno, "sem_getvalue() failed: %s", strerror(errno)); + THROWF(system_error, errno, "sem_getvalue() failed: %s", + strerror(errno)); } /* ********************************* WINDOWS IMPLEMENTATION ************************************ */ -#elif defined(WIN32) +#elif defined(_XBT_WIN32) #include @@ -585,6 +633,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 */ @@ -593,31 +642,37 @@ typedef struct xbt_os_thread_ { #endif /* the default size of the stack of the threads (in bytes)*/ -#define XBT_DEFAULT_THREAD_STACK_SIZE 4096 +#define XBT_DEFAULT_THREAD_STACK_SIZE 4096 /* key to the TLS containing the xbt_os_thread_t structure */ static unsigned long xbt_self_thread_key; -void xbt_os_thread_mod_init(void) +void xbt_os_thread_mod_preinit(void) { xbt_self_thread_key = TlsAlloc(); } -void xbt_os_thread_mod_exit(void) +void xbt_os_thread_mod_postexit(void) { if (!TlsFree(xbt_self_thread_key)) - THROW0(system_error, (int) GetLastError(), + THROWF(system_error, (int) GetLastError(), "TlsFree() failed to cleanup the thread submodule"); } +int xbt_os_thread_atfork(void (*prepare)(void), + void (*parent)(void), void (*child)(void)) +{ + return 0; +} + static DWORD WINAPI wrapper_start_routine(void *s) { xbt_os_thread_t t = (xbt_os_thread_t) s; DWORD *rv; if (!TlsSetValue(xbt_self_thread_key, t)) - THROW0(system_error, (int) GetLastError(), + THROWF(system_error, (int) GetLastError(), "TlsSetValue of data describing the created thread failed"); rv = (DWORD *) ((t->start_routine) (t->param)); @@ -629,7 +684,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); @@ -637,14 +693,14 @@ 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)); if (!t->handle) { xbt_free(t); - THROW0(system_error, (int) GetLastError(), "CreateThread failed"); + THROWF(system_error, (int) GetLastError(), "CreateThread failed"); } return t; @@ -665,18 +721,19 @@ void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return) { if (WAIT_OBJECT_0 != WaitForSingleObject(thread->handle, INFINITE)) - THROW0(system_error, (int) GetLastError(), "WaitForSingleObject failed"); + THROWF(system_error, (int) GetLastError(), + "WaitForSingleObject failed"); if (thread_return) { if (!GetExitCodeThread(thread->handle, (DWORD *) (*thread_return))) - THROW0(system_error, (int) GetLastError(), "GetExitCodeThread failed"); + THROWF(system_error, (int) GetLastError(), + "GetExitCodeThread failed"); } CloseHandle(thread->handle); - if (thread->name) - free(thread->name); + free(thread->name); free(thread); } @@ -689,6 +746,27 @@ void xbt_os_thread_exit(int *retval) ExitThread(0); } +void xbt_os_thread_key_create(xbt_os_thread_key_t* key) { + + *key = TlsAlloc(); +} + +void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) { + + if (!TlsSetValue(key, value)) + THROWF(system_error, (int) GetLastError(), "TlsSetValue() failed"); +} + +void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) { + return TlsGetValue(key); +} + +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); @@ -709,7 +787,7 @@ void xbt_os_thread_yield(void) void xbt_os_thread_cancel(xbt_os_thread_t t) { if (!TerminateThread(t->handle, 0)) - THROW0(system_error, (int) GetLastError(), "TerminateThread failed"); + THROWF(system_error, (int) GetLastError(), "TerminateThread failed"); } /****** mutex related functions ******/ @@ -788,7 +866,7 @@ xbt_os_cond_t xbt_os_cond_init(void) if (!res->events[SIGNAL]) { DeleteCriticalSection(&res->waiters_count_lock); free(res); - THROW0(system_error, 0, "CreateEvent failed for the signals"); + THROWF(system_error, 0, "CreateEvent failed for the signals"); } /* Create a manual-reset event. */ @@ -799,7 +877,7 @@ xbt_os_cond_t xbt_os_cond_init(void) DeleteCriticalSection(&res->waiters_count_lock); CloseHandle(res->events[SIGNAL]); free(res); - THROW0(system_error, 0, "CreateEvent failed for the broadcasts"); + THROWF(system_error, 0, "CreateEvent failed for the broadcasts"); } return res; @@ -823,7 +901,7 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) wait_result = WaitForMultipleObjects(2, cond->events, FALSE, INFINITE); if (wait_result == WAIT_FAILED) - THROW0(system_error, 0, + THROWF(system_error, 0, "WaitForMultipleObjects failed, so we cannot wait on the condition"); /* we have a signal lock the condition */ @@ -842,7 +920,7 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) */ if (is_last_waiter) if (!ResetEvent(cond->events[BROADCAST])) - THROW0(system_error, 0, "ResetEvent failed"); + THROWF(system_error, 0, "ResetEvent failed"); /* relock the mutex associated with the condition in accordance with the posix thread specification */ EnterCriticalSection(&mutex->lock); @@ -860,8 +938,8 @@ void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, if (delay < 0) { xbt_os_cond_wait(cond, mutex); } else { - DEBUG3("xbt_cond_timedwait(%p,%p,%lu)", &(cond->events), &(mutex->lock), - end); + XBT_DEBUG("xbt_cond_timedwait(%p,%p,%lu)", &(cond->events), + &(mutex->lock), end); /* lock the threads counter and increment it */ EnterCriticalSection(&cond->waiters_count_lock); @@ -876,11 +954,11 @@ void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, switch (wait_result) { case WAIT_TIMEOUT: - THROW3(timeout_error, GetLastError(), + THROWF(timeout_error, GetLastError(), "condition %p (mutex %p) wasn't signaled before timeout (%f)", cond, mutex, delay); case WAIT_FAILED: - THROW0(system_error, GetLastError(), + THROWF(system_error, GetLastError(), "WaitForMultipleObjects failed, so we cannot wait on the condition"); } @@ -900,7 +978,7 @@ void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, */ if (is_last_waiter) if (!ResetEvent(cond->events[BROADCAST])) - THROW0(system_error, 0, "ResetEvent failed"); + THROWF(system_error, 0, "ResetEvent failed"); /* relock the mutex associated with the condition in accordance with the posix thread specification */ EnterCriticalSection(&mutex->lock); @@ -918,7 +996,7 @@ void xbt_os_cond_signal(xbt_os_cond_t cond) if (have_waiters) if (!SetEvent(cond->events[SIGNAL])) - THROW0(system_error, 0, "SetEvent failed"); + THROWF(system_error, 0, "SetEvent failed"); xbt_os_thread_yield(); } @@ -953,7 +1031,7 @@ void xbt_os_cond_destroy(xbt_os_cond_t cond) xbt_free(cond); if (error) - THROW0(system_error, 0, "Error while destroying the condition"); + THROWF(system_error, 0, "Error while destroying the condition"); } typedef struct xbt_os_sem_ { @@ -971,14 +1049,14 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) xbt_os_sem_t res; if (value > INT_MAX) - THROW1(arg_error, value, + THROWF(arg_error, value, "Semaphore initial value too big: %ud cannot be stored as a signed int", value); res = (xbt_os_sem_t) xbt_new0(s_xbt_os_sem_t, 1); if (!(res->h = CreateSemaphore(NULL, value, (long) INT_MAX, NULL))) { - THROW1(system_error, GetLastError(), "CreateSemaphore() failed: %s", + THROWF(system_error, GetLastError(), "CreateSemaphore() failed: %s", strerror(GetLastError())); return NULL; } @@ -993,12 +1071,12 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) void xbt_os_sem_acquire(xbt_os_sem_t sem) { if (!sem) - THROW0(arg_error, EINVAL, "Cannot acquire the NULL semaphore"); + THROWF(arg_error, EINVAL, "Cannot acquire the NULL semaphore"); /* wait failure */ if (WAIT_OBJECT_0 != WaitForSingleObject(sem->h, INFINITE)) - THROW1(system_error, GetLastError(), "WaitForSingleObject() failed: %s", - strerror(GetLastError())); + THROWF(system_error, GetLastError(), + "WaitForSingleObject() failed: %s", strerror(GetLastError())); EnterCriticalSection(&(sem->value_lock)); sem->value--; LeaveCriticalSection(&(sem->value_lock)); @@ -1011,7 +1089,7 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double timeout) double end = timeout + xbt_os_time(); if (!sem) - THROW0(arg_error, EINVAL, "Cannot acquire the NULL semaphore"); + THROWF(arg_error, EINVAL, "Cannot acquire the NULL semaphore"); if (timeout < 0) { xbt_os_sem_acquire(sem); @@ -1030,13 +1108,13 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double timeout) return; case WAIT_TIMEOUT: - THROW2(timeout_error, GetLastError(), + THROWF(timeout_error, GetLastError(), "semaphore %p wasn't signaled before timeout (%f)", sem, timeout); return; default: - THROW3(system_error, GetLastError(), + THROWF(system_error, GetLastError(), "WaitForSingleObject(%p,%f) failed: %s", sem, timeout, strerror(GetLastError())); } @@ -1046,10 +1124,10 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double timeout) void xbt_os_sem_release(xbt_os_sem_t sem) { if (!sem) - THROW0(arg_error, EINVAL, "Cannot release the NULL semaphore"); + THROWF(arg_error, EINVAL, "Cannot release the NULL semaphore"); if (!ReleaseSemaphore(sem->h, 1, NULL)) - THROW1(system_error, GetLastError(), "ReleaseSemaphore() failed: %s", + THROWF(system_error, GetLastError(), "ReleaseSemaphore() failed: %s", strerror(GetLastError())); EnterCriticalSection(&(sem->value_lock)); sem->value++; @@ -1059,10 +1137,10 @@ void xbt_os_sem_release(xbt_os_sem_t sem) void xbt_os_sem_destroy(xbt_os_sem_t sem) { if (!sem) - THROW0(arg_error, EINVAL, "Cannot destroy the NULL semaphore"); + THROWF(arg_error, EINVAL, "Cannot destroy the NULL semaphore"); if (!CloseHandle(sem->h)) - THROW1(system_error, GetLastError(), "CloseHandle() failed: %s", + THROWF(system_error, GetLastError(), "CloseHandle() failed: %s", strerror(GetLastError())); DeleteCriticalSection(&(sem->value_lock)); @@ -1074,11 +1152,106 @@ void xbt_os_sem_destroy(xbt_os_sem_t sem) void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue) { if (!sem) - THROW0(arg_error, EINVAL, "Cannot get the value of the NULL semaphore"); + THROWF(arg_error, EINVAL, + "Cannot get the value of the NULL semaphore"); EnterCriticalSection(&(sem->value_lock)); *svalue = sem->value; LeaveCriticalSection(&(sem->value_lock)); } + #endif + + +/** @brief Returns the amount of cores on the current host */ +int xbt_os_get_numcores(void) { +#ifdef WIN32 + SYSTEM_INFO sysinfo; + GetSystemInfo(&sysinfo); + return sysinfo.dwNumberOfProcessors; +#elif MACOS + int nm[2]; + size_t len = 4; + uint32_t count; + + nm[0] = CTL_HW; nm[1] = HW_AVAILCPU; + sysctl(nm, 2, &count, &len, NULL, 0); + + if(count < 1) { + nm[1] = HW_NCPU; + sysctl(nm, 2, &count, &len, NULL, 0); + if(count < 1) { count = 1; } + } + return count; +#else + return sysconf(_SC_NPROCESSORS_ONLN); +#endif +} + + +/***** reentrant mutexes *****/ +typedef struct xbt_os_rmutex_ { + xbt_os_mutex_t mutex; + xbt_os_thread_t owner; + int count; +} s_xbt_os_rmutex_t; + +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; +} + +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); +}