X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f55e79d40e8dcabcc15f7fe74558deadcd50ff18..e816186fdeaf53fa5abf6886f157c499e09c4622:/src/xbt/xbt_os_thread.c

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index 4914b24d0b..707f5b9cf6 100644
--- a/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@ -2,13 +2,30 @@
 /* Used in RL to get win/lin portability, and in SG when CONTEXT_THREAD     */
 /* in SG, when using HAVE_UCONTEXT_CONTEXTS, xbt_os_thread_stub is used instead   */
 
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2019. 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. */
 
-#if defined(WIN32)
+#include "src/internal_config.h"
+#if HAVE_PTHREAD_SETAFFINITY
+#define _GNU_SOURCE
+#include <sched.h>
+#endif
+
+#include <pthread.h>
+
+#if defined(__FreeBSD__)
+#include "pthread_np.h"
+#define cpu_set_t cpuset_t
+#endif
+
+#include <limits.h>
+#include <semaphore.h>
+#include <errno.h>
+
+#if defined(_WIN32)
+#include <windows.h>
 #elif defined(__MACH__) && defined(__APPLE__)
 #include <stdint.h>
 #include <sys/types.h>
@@ -17,325 +34,111 @@
 #include <unistd.h>
 #endif
 
-#include "src/internal_config.h"
 #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 "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)");
-
-/* ********************************* PTHREAD IMPLEMENTATION ************************************ */
-#include <pthread.h>
-#include <limits.h>
-#include <semaphore.h>
-
-#ifdef CORE_BINDING
-#define _GNU_SOURCE
-#include <sched.h>
-#endif
+#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 */
 
-/* use named sempahore when sem_init() does not work */
-#ifndef HAVE_SEM_INIT
-static int next_sem_ID = 0;
-static xbt_os_mutex_t next_sem_ID_lock;
-#endif
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)");
 
 typedef struct xbt_os_thread_ {
   pthread_t t;
-  int detached;
-  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;
 
 /* thread-specific data containing the xbt_os_thread_t structure */
-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)
 {
   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)
-{
-  xbt_ex_display(e);
-  xbt_abort();
-  /* FIXME: there should be a configuration variable to choose to kill everyone or only this one */
-}
-
 void xbt_os_thread_mod_preinit(void)
 {
-  int errcode;
-
   if (thread_mod_inited)
     return;
 
-  if ((errcode = pthread_key_create(&xbt_self_thread_key, NULL)))
-    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 = NULL;
-  main_thread->detached = 0;
-  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
-  next_sem_ID_lock = xbt_os_mutex_init();
-#endif
-
 }
 
 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)))
-  //     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
-  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))
+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)
 {
   xbt_os_thread_t t = s;
-  int errcode;
-
-  if ((errcode = pthread_setspecific(xbt_self_thread_key, t)))
-    THROWF(system_error, errcode,
-           "pthread_setspecific failed for xbt_self_thread_key");
 
-  void *res = t->start_routine(t->param);
-  if (t->detached)
-    xbt_os_thread_free_thread_data(t);
-  return res;
+  return t->start_routine(t->param);
 }
 
-
-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 xbt_os_thread_create(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->detached = 0;
-  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;
-  
-  if ((errcode = pthread_create(&(res_thread->t), &thread_attr,
-                                wrapper_start_routine, res_thread)))
-    THROWF(system_error, errcode,
-           "pthread_create failed: %s", strerror(errcode));
-
 
+  int errcode = pthread_create(&(res_thread->t), NULL, wrapper_start_routine, res_thread);
+  xbt_assert(errcode == 0, "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;
+/** 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_ATTRIB_UNUSED xbt_os_thread_t thread, XBT_ATTRIB_UNUSED int cpu)
+{
   int errcode = 0;
+#if HAVE_PTHREAD_SETAFFINITY
+  pthread_t pthread = thread->t;
   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;
-}
-
-const char *xbt_os_thread_self_name(void)
-{
-  xbt_os_thread_t me = xbt_os_thread_self();
-  return me ? me->name : "main";
+  return errcode;
 }
 
 void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return)
 {
+  int errcode = pthread_join(thread->t, thread_return);
 
-  int errcode;
-
-  if ((errcode = pthread_join(thread->t, thread_return)))
-    THROWF(system_error, errcode, "pthread_join failed: %s",
-           strerror(errcode));
+  xbt_assert(errcode==0, "pthread_join failed: %s", strerror(errcode));
   xbt_os_thread_free_thread_data(thread);
 }
 
-void xbt_os_thread_exit(int *retval)
-{
-  pthread_exit(retval);
-}
-
-xbt_os_thread_t xbt_os_thread_self(void)
-{
-  if (!thread_mod_inited)
-    return NULL;
-
-  return pthread_getspecific(xbt_self_thread_key);
-}
-
-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 <sched.h>
-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 */
   pthread_mutex_t m;
 } s_xbt_os_mutex_t;
 
@@ -344,452 +147,35 @@ typedef struct xbt_os_mutex_ {
 
 xbt_os_mutex_t xbt_os_mutex_init(void)
 {
-  xbt_os_mutex_t res = xbt_new(s_xbt_os_mutex_t, 1);
-  int errcode;
+  pthread_mutexattr_t Attr;
+  pthread_mutexattr_init(&Attr);
+  pthread_mutexattr_settype(&Attr, PTHREAD_MUTEX_RECURSIVE);
 
-  if ((errcode = pthread_mutex_init(&(res->m), NULL)))
-    THROWF(system_error, errcode, "pthread_mutex_init() failed: %s",
-           strerror(errcode));
+  xbt_os_mutex_t res = xbt_new(s_xbt_os_mutex_t, 1);
+  int errcode = pthread_mutex_init(&(res->m), &Attr);
+  xbt_assert(errcode==0, "pthread_mutex_init() failed: %s", strerror(errcode));
 
   return res;
 }
 
 void xbt_os_mutex_acquire(xbt_os_mutex_t mutex)
 {
-  int errcode;
-
-  if ((errcode = pthread_mutex_lock(&(mutex->m))))
-    THROWF(system_error, errcode, "pthread_mutex_lock(%p) failed: %s",
-           mutex, strerror(errcode));
-}
-
-
-void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
-{
-  int errcode;
-
-  if (delay < 0) {
-    xbt_os_mutex_acquire(mutex);
-
-  } else if (delay == 0) {
-    errcode = pthread_mutex_trylock(&(mutex->m));
-
-    switch (errcode) {
-    case 0:
-      return;
-    case ETIMEDOUT:
-      THROWF(timeout_error, 0, "mutex %p not ready", mutex);
-    default:
-      THROWF(system_error, errcode,
-             "xbt_os_mutex_timedacquire(%p) failed: %s", mutex,
-             strerror(errcode));
-    }
-
-
-  } else {
-
-#ifdef HAVE_MUTEX_TIMEDLOCK
-    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);
-    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 */
-    double start = xbt_os_time();
-    do {
-      errcode = pthread_mutex_trylock(&(mutex->m));
-      if (errcode == EBUSY)
-        xbt_os_thread_yield();
-    } while (errcode == EBUSY && xbt_os_time() - start < delay);
-
-    if (errcode == EBUSY)
-      errcode = ETIMEDOUT;
-
-#endif                          /* HAVE_MUTEX_TIMEDLOCK */
-
-    switch (errcode) {
-    case 0:
-      return;
-
-    case ETIMEDOUT:
-      THROWF(timeout_error, delay,
-             "mutex %p wasn't signaled before timeout (%f)", mutex, delay);
-
-    default:
-      THROWF(system_error, errcode,
-             "pthread_mutex_timedlock(%p,%f) failed: %s", mutex, delay,
-             strerror(errcode));
-    }
-  }
+  int errcode = pthread_mutex_lock(&(mutex->m));
+  xbt_assert(errcode==0, "pthread_mutex_lock(%p) failed: %s", mutex, strerror(errcode));
 }
 
 void xbt_os_mutex_release(xbt_os_mutex_t mutex)
 {
-  int errcode;
-
-  if ((errcode = pthread_mutex_unlock(&(mutex->m))))
-    THROWF(system_error, errcode, "pthread_mutex_unlock(%p) failed: %s",
-           mutex, strerror(errcode));
+  int errcode = pthread_mutex_unlock(&(mutex->m));
+  xbt_assert(errcode==0, "pthread_mutex_unlock(%p) failed: %s", mutex, strerror(errcode));
 }
 
 void xbt_os_mutex_destroy(xbt_os_mutex_t mutex)
 {
-  int errcode;
-
   if (!mutex)
     return;
 
-  if ((errcode = pthread_mutex_destroy(&(mutex->m))))
-    THROWF(system_error, errcode, "pthread_mutex_destroy(%p) failed: %s",
-           mutex, strerror(errcode));
+  int errcode = pthread_mutex_destroy(&(mutex->m));
+  xbt_assert(errcode == 0, "pthread_mutex_destroy(%p) failed: %s", mutex, strerror(errcode));
   free(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;
-
-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)))
-    THROWF(system_error, errcode, "pthread_cond_init() failed: %s",
-           strerror(errcode));
-
-  return res;
-}
-
-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))))
-    THROWF(system_error, errcode, "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;
-  if ((errcode = pthread_cond_signal(&(cond->c))))
-    THROWF(system_error, errcode, "pthread_cond_signal(%p) failed: %s",
-           cond, strerror(errcode));
-}
-
-void xbt_os_cond_broadcast(xbt_os_cond_t cond)
-{
-  int errcode;
-  if ((errcode = pthread_cond_broadcast(&(cond->c))))
-    THROWF(system_error, errcode, "pthread_cond_broadcast(%p) failed: %s",
-           cond, strerror(errcode));
-}
-
-void xbt_os_cond_destroy(xbt_os_cond_t cond)
-{
-  int errcode;
-
-  if (!cond)
-    return;
-
-  if ((errcode = pthread_cond_destroy(&(cond->c))))
-    THROWF(system_error, errcode, "pthread_cond_destroy(%p) failed: %s",
-           cond, strerror(errcode));
-  free(cond);
-}
-
-void *xbt_os_thread_getparam(void)
-{
-  xbt_os_thread_t t = xbt_os_thread_self();
-  return t ? t->param : NULL;
-}
-
-typedef struct xbt_os_sem_ {
-#ifndef HAVE_SEM_INIT
-  char *name;
-#endif
-  sem_t s;
-  sem_t *ps;
-} s_xbt_os_sem_t;
-
-#ifndef SEM_FAILED
-#define SEM_FAILED (-1)
-#endif
-
-xbt_os_sem_t xbt_os_sem_init(unsigned int value)
-{
-  xbt_os_sem_t res = xbt_new(s_xbt_os_sem_t, 1);
-
-  /* On some systems (MAC OS X), only the stub of sem_init is to be found.
-   * 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 (sem_init(&(res->s), 0, value) != 0)
-    THROWF(system_error, errno, "sem_init() failed: %s", strerror(errno));
-  res->ps = &(res->s);
-
-#else                           /* damn, no sem_init(). Reimplement it */
-
-  xbt_os_mutex_acquire(next_sem_ID_lock);
-  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, value);
-  }
-  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)
-    THROWF(system_error, errno, "sem_unlink() failed: %s",
-           strerror(errno));
-
-#endif
-
-  return res;
-}
-
-void xbt_os_sem_acquire(xbt_os_sem_t sem)
-{
-  if (!sem)
-    THROWF(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
-  if (sem_wait(sem->ps) < 0)
-    THROWF(system_error, errno, "sem_wait() failed: %s", strerror(errno));
-}
-
-void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
-{
-  int errcode;
-
-  if (!sem)
-    THROWF(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
-
-  if (delay < 0) {
-    xbt_os_sem_acquire(sem);
-  } else if (delay == 0) {
-    errcode = sem_trywait(sem->ps);
-
-    switch (errcode) {
-    case 0:
-      return;
-    case ETIMEDOUT:
-      THROWF(timeout_error, 0, "semaphore %p not ready", sem);
-    default:
-      THROWF(system_error, errcode,
-             "xbt_os_sem_timedacquire(%p) failed: %s", sem,
-             strerror(errcode));
-    }
-
-  } else {
-#ifdef HAVE_SEM_WAIT
-    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);
-    XBT_DEBUG("sem_timedwait(%p,%p)", sem->ps, &ts_end);
-    errcode = sem_timedwait(sem->s, &ts_end);
-
-#else                           /* Okay, reimplement this function then */
-    double start = xbt_os_time();
-    do {
-      errcode = sem_trywait(sem->ps);
-      if (errcode == EBUSY)
-        xbt_os_thread_yield();
-    } while (errcode == EBUSY && xbt_os_time() - start < delay);
-
-    if (errcode == EBUSY)
-      errcode = ETIMEDOUT;
-#endif
-
-    switch (errcode) {
-    case 0:
-      return;
-
-    case ETIMEDOUT:
-      THROWF(timeout_error, delay,
-             "semaphore %p wasn't signaled before timeout (%f)", sem,
-             delay);
-
-    default:
-      THROWF(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", sem,
-             delay, strerror(errcode));
-    }
-  }
-}
-
-void xbt_os_sem_release(xbt_os_sem_t sem)
-{
-  if (!sem)
-    THROWF(arg_error, EINVAL, "Cannot release of the NULL semaphore");
-
-  if (sem_post(sem->ps) < 0)
-    THROWF(system_error, errno, "sem_post() failed: %s", strerror(errno));
-}
-
-void xbt_os_sem_destroy(xbt_os_sem_t sem)
-{
-  if (!sem)
-    THROWF(arg_error, EINVAL, "Cannot destroy the NULL sempahore");
-
-#ifdef HAVE_SEM_INIT
-  if (sem_destroy(sem->ps) < 0)
-    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)
-    THROWF(arg_error, EINVAL,
-           "Cannot get the value of the NULL semaphore");
-
-  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
-    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;
-}
-
-void *xbt_os_thread_get_extra_data(void)
-{
-  xbt_os_thread_t thread = xbt_os_thread_self();
-  if (thread)
-    return xbt_os_thread_self()->extra_data;
-  else
-    return 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);
-}