X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dea681ea743073d1049681a49bd946c339ce797a..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 2cd9d8751d..d7545b4dfb 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -2,13 +2,22 @@ /* 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 (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2015. 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" +#if defined(WIN32) +#elif defined(__MACH__) && defined(__APPLE__) +#include +#include +#include +#else +#include +#endif + +#include "internal_config.h" #include "xbt/sysdep.h" #include "xbt/ex.h" #include "xbt/ex_interface.h" /* We play crude games with exceptions */ @@ -21,18 +30,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)"); /* ********************************* PTHREAD IMPLEMENTATION ************************************ */ -#ifdef HAVE_PTHREAD_H +#ifndef _XBT_WIN32 #include +#include #include -#ifdef HAVE_MUTEX_TIMEDLOCK -/* redefine the function header since we fail to get this from system headers on amd (at least) */ -int pthread_mutex_timedlock(pthread_mutex_t * mutex, - const struct timespec *abs_timeout); +#ifdef CORE_BINDING +#define _GNU_SOURCE +#include #endif - /* use named sempahore when sem_init() does not work */ #ifndef HAVE_SEM_INIT static int next_sem_ID = 0; @@ -54,6 +62,10 @@ static xbt_os_thread_t main_thread = NULL; static pthread_key_t xbt_self_thread_key; static int thread_mod_inited = 0; +/* defaults attribute for pthreads */ +//FIXME: find where to put this +static pthread_attr_t thread_attr; + /* frees the xbt_os_thread_t corresponding to the current thread */ static void xbt_os_thread_free_thread_data(xbt_os_thread_t thread) { @@ -75,8 +87,7 @@ static xbt_running_ctx_t *_os_thread_get_running_ctx(void) 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 */ } @@ -88,7 +99,7 @@ void xbt_os_thread_mod_preinit(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); @@ -99,13 +110,14 @@ void xbt_os_thread_mod_preinit(void) XBT_RUNNING_CTX_INITIALIZE(main_thread->running_ctx); if ((errcode = pthread_setspecific(xbt_self_thread_key, main_thread))) - THROW0(system_error, errcode, + 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; + pthread_attr_init(&thread_attr); + thread_mod_inited = 1; #ifndef HAVE_SEM_INIT @@ -121,7 +133,7 @@ void xbt_os_thread_mod_postexit(void) // int errcode; // if ((errcode=pthread_key_delete(xbt_self_thread_key))) - // THROW0(system_error,errcode,"pthread_key_delete failed for 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; @@ -135,10 +147,15 @@ void xbt_os_thread_mod_postexit(void) __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) @@ -147,15 +164,16 @@ 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"); - void *res = (*(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, @@ -172,14 +190,78 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, XBT_RUNNING_CTX_INITIALIZE(res_thread->running_ctx); res_thread->extra_data = extra_data; - if ((errcode = pthread_create(&(res_thread->t), NULL, + if ((errcode = pthread_create(&(res_thread->t), &thread_attr, wrapper_start_routine, res_thread))) - THROW1(system_error, errcode, + THROWF(system_error, errcode, "pthread_create failed: %s", strerror(errcode)); + + return res_thread; } + +#ifdef CORE_BINDING +int xbt_os_thread_bind(xbt_os_thread_t thread, int cpu){ + pthread_t pthread = thread->t; + int errcode = 0; + cpu_set_t cpuset; + CPU_ZERO(&cpuset); + CPU_SET(cpu, &cpuset); + errcode = pthread_setaffinity_np(pthread, sizeof(cpu_set_t), &cpuset); + return errcode; +} +#endif + +void xbt_os_thread_setstacksize(int stack_size) +{ + size_t alignment[] = { + xbt_pagesize, +#ifdef PTHREAD_STACK_MIN + PTHREAD_STACK_MIN, +#endif + 0 + }; + size_t sz; + int res; + int i; + + if (stack_size < 0) + xbt_die("stack size %d is negative, maybe it exceeds MAX_INT?", stack_size); + + sz = stack_size; + res = pthread_attr_setstacksize(&thread_attr, sz); + + for (i = 0; res == EINVAL && alignment[i] > 0; i++) { + /* Invalid size, try again with next multiple of alignment[i]. */ + size_t rem = sz % alignment[i]; + if (rem != 0 || sz == 0) { + size_t sz2 = sz - rem + alignment[i]; + XBT_DEBUG("pthread_attr_setstacksize failed for %zd, try again with %zd", + sz, sz2); + sz = sz2; + res = pthread_attr_setstacksize(&thread_attr, sz); + } + } + + if (res == EINVAL) + XBT_WARN("invalid stack size (maybe too big): %zd", sz); + else if (res != 0) + XBT_WARN("unknown error %d in pthread stacksize setting: %zd", res, sz); +} + +void xbt_os_thread_setguardsize(int guard_size) +{ +#ifdef WIN32 + THROW_UNIMPLEMENTED; //pthread_attr_setguardsize is not implemented in pthread.h on windows +#else + size_t sz = guard_size; + int res = pthread_attr_setguardsize(&thread_attr, sz); + if (res) + XBT_WARN("pthread_attr_setguardsize failed (%d) for size: %zd", res, sz); +#endif +} + const char *xbt_os_thread_name(xbt_os_thread_t t) { return t->name; @@ -197,7 +279,7 @@ 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)); xbt_os_thread_free_thread_data(thread); } @@ -219,6 +301,24 @@ xbt_os_thread_t xbt_os_thread_self(void) 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; @@ -251,7 +351,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; @@ -262,7 +362,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)); } @@ -281,10 +381,10 @@ 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, + THROWF(system_error, errcode, + "xbt_os_mutex_timedacquire(%p) failed: %s", mutex, strerror(errcode)); } @@ -319,11 +419,11 @@ void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) 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)); } @@ -335,7 +435,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)); } @@ -347,7 +447,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); } @@ -363,7 +463,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; @@ -373,7 +473,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)); } @@ -397,11 +497,11 @@ void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, 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)); } @@ -412,7 +512,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)); } @@ -420,7 +520,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)); } @@ -432,7 +532,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); } @@ -465,7 +565,7 @@ 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 */ @@ -478,14 +578,14 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int 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)); + if (res->ps == (sem_t *) SEM_FAILED) + 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", + THROWF(system_error, errno, "sem_unlink() failed: %s", strerror(errno)); #endif @@ -496,9 +596,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) @@ -506,7 +606,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); @@ -517,9 +617,9 @@ 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, + THROWF(system_error, errcode, "xbt_os_sem_timedacquire(%p) failed: %s", sem, strerror(errcode)); } @@ -551,12 +651,12 @@ void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay) return; case ETIMEDOUT: - THROW2(timeout_error, 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)); } } @@ -565,24 +665,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", + 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 @@ -592,11 +692,11 @@ 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, + 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", + THROWF(system_error, errno, "sem_getvalue() failed: %s", strerror(errno)); } @@ -621,8 +721,8 @@ 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 +static int stack_size=0; /* key to the TLS containing the xbt_os_thread_t structure */ static unsigned long xbt_self_thread_key; @@ -635,7 +735,7 @@ 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"); } @@ -651,7 +751,7 @@ static DWORD WINAPI wrapper_start_routine(void *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)); @@ -673,18 +773,28 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, t->start_routine = start_routine; t->param = param; t->extra_data = extra_data; - t->handle = CreateThread(NULL, XBT_DEFAULT_THREAD_STACK_SIZE, + t->handle = CreateThread(NULL, stack_size==0 ? XBT_DEFAULT_THREAD_STACK_SIZE : 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; } +void xbt_os_thread_setstacksize(int size) +{ + stack_size = size; +} + +void xbt_os_thread_setguardsize(int size) +{ + XBT_WARN("xbt_os_thread_setguardsize is not implemented (%d)", size); +} + const char *xbt_os_thread_name(xbt_os_thread_t t) { return t->name; @@ -700,20 +810,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(), + THROWF(system_error, (int) GetLastError(), "WaitForSingleObject failed"); if (thread_return) { if (!GetExitCodeThread(thread->handle, (DWORD *) (*thread_return))) - THROW0(system_error, (int) GetLastError(), + THROWF(system_error, (int) GetLastError(), "GetExitCodeThread failed"); } CloseHandle(thread->handle); - if (thread->name) - free(thread->name); + free(thread->name); free(thread); } @@ -726,6 +835,21 @@ 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; @@ -752,7 +876,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 ******/ @@ -831,7 +955,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. */ @@ -842,7 +966,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; @@ -866,7 +990,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 */ @@ -885,7 +1009,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); @@ -919,11 +1043,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"); } @@ -943,7 +1067,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); @@ -961,7 +1085,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(); } @@ -996,7 +1120,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_ { @@ -1014,14 +1138,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; } @@ -1036,11 +1160,11 @@ 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(), + THROWF(system_error, GetLastError(), "WaitForSingleObject() failed: %s", strerror(GetLastError())); EnterCriticalSection(&(sem->value_lock)); sem->value--; @@ -1054,7 +1178,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); @@ -1073,13 +1197,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())); } @@ -1089,10 +1213,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++; @@ -1102,10 +1226,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)); @@ -1117,7 +1241,7 @@ 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, + THROWF(arg_error, EINVAL, "Cannot get the value of the NULL semaphore"); EnterCriticalSection(&(sem->value_lock)); @@ -1128,6 +1252,40 @@ void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue) #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 defined(__APPLE__) && defined(__MACH__) + 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; @@ -1135,5 +1293,55 @@ void xbt_os_thread_set_extra_data(void *data) void *xbt_os_thread_get_extra_data(void) { - return xbt_os_thread_self()->extra_data; + xbt_os_thread_t self = xbt_os_thread_self(); + return self? self->extra_data : NULL; +} + +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); }