Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
I don't even know why it worked before.
[simgrid.git] / src / xbt / xbt_os_thread.c
index c7e40d3..b020ebd 100644 (file)
@@ -1,51 +1,52 @@
-/* $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 */
+#include "xbt/ex_interface.h"   /* We play crude games with exceptions */
 #include "portable.h"
-#include "xbt/xbt_os_time.h" /* Portable time facilities */
-#include "xbt/xbt_os_thread.h" /* This module */
-#include "xbt_modinter.h" /* Initialization/finalization of this module */
+#include "xbt/xbt_os_time.h"    /* Portable time facilities */
+#include "xbt/xbt_os_thread.h"  /* This module */
+#include "xbt_modinter.h"       /* Initialization/finalization of this module */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os,xbt,"Synchronization mechanism (OS-level)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt,
+                                "Synchronization mechanism (OS-level)");
 
 /* ********************************* PTHREAD IMPLEMENTATION ************************************ */
 #ifdef HAVE_PTHREAD_H
 
-#include <pthread.h>
 #include <semaphore.h>
 
 #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);
+int pthread_mutex_timedlock(pthread_mutex_t * mutex,
+                            const struct timespec *abs_timeout);
 #endif
-  
+
 
 /* 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;
+static int next_sem_ID = 0;
+static xbt_os_mutex_t next_sem_ID_lock;
 #endif
 
 typedef struct xbt_os_thread_ {
-   pthread_t t;
-   char *name;
-   void *param;
-   pvoid_f_pvoid_t start_routine;
-   ex_ctx_t *exception;
-} s_xbt_os_thread_t ;
+  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 */
@@ -53,487 +54,583 @@ 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){
-   free(d);
+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 ex_ctx_t *_os_thread_ex_ctx(void) {
-  return xbt_os_thread_self()->exception;
+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) {
+static void _os_thread_ex_terminate(xbt_ex_t * e)
+{
   xbt_ex_display(e);
 
   abort();
   /* FIXME: there should be a configuration variable to choose to kill everyone or only this one */
 }
 
-void xbt_os_thread_mod_init(void) {
-   int errcode;
+void xbt_os_thread_mod_preinit(void)
+{
+  int errcode;
+
+  if (thread_mod_inited)
+    return;
 
-   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 = (char *) "main";
+  main_thread->start_routine = NULL;
+  main_thread->param = NULL;
+  main_thread->running_ctx = xbt_new(xbt_running_ctx_t, 1);
+  XBT_RUNNING_CTX_INITIALIZE(main_thread->running_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;
 
-   if ((errcode=pthread_key_create(&xbt_self_thread_key, NULL)))
-     THROW0(system_error,errcode,"pthread_key_create failed for xbt_self_thread_key");
+  thread_mod_inited = 1;
 
-   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);
+#ifndef HAVE_SEM_INIT
+  next_sem_ID_lock = xbt_os_mutex_init();
+#endif
 
-   __xbt_ex_ctx = _os_thread_ex_ctx;
-   __xbt_ex_terminate = _os_thread_ex_terminate;
+}
 
-   thread_mod_inited = 1;
-   
-   #ifndef HAVE_SEM_WAIT
-   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;
 }
-void xbt_os_thread_mod_exit(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");
+int xbt_os_thread_atfork(void (*prepare)(void),
+                         void (*parent)(void), void (*child)(void))
+{
+  return pthread_atfork(prepare, parent, child);
 }
 
-static void * wrapper_start_routine(void *s) {
+static void *wrapper_start_routine(void *s)
+{
   xbt_os_thread_t t = s;
   int errcode;
 
-  if ((errcode=pthread_setspecific(xbt_self_thread_key,t)))
-    THROW0(system_error,errcode,
-          "pthread_setspecific failed for xbt_self_thread_key");
+  if ((errcode = pthread_setspecific(xbt_self_thread_key, t)))
+    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)  {
-   int errcode;
-
-   xbt_os_thread_t res_thread=xbt_new(s_xbt_os_thread_t,1);
-   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);
+xbt_os_thread_t xbt_os_thread_create(const char *name,
+                                     pvoid_f_pvoid_t start_routine,
+                                     void *param,
+                                     void *extra_data)
+{
+  int errcode;
 
-   if ((errcode = pthread_create(&(res_thread->t), NULL,
-                                wrapper_start_routine, res_thread)))
-     THROW1(system_error,errcode,
-           "pthread_create failed: %s",strerror(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), NULL,
+                                wrapper_start_routine, res_thread)))
+    THROWF(system_error, errcode,
+           "pthread_create failed: %s", strerror(errcode));
 
-   return res_thread;
+  return res_thread;
 }
 
-const char* xbt_os_thread_name(xbt_os_thread_t t) {
-   return t->name;
+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 self = xbt_os_thread_self();
-   return self?self->name:"main";
+const char *xbt_os_thread_self_name(void)
+{
+  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) {
-
-  int errcode;
 
-  if ((errcode = pthread_join(thread->t,thread_return)))
-    THROW1(system_error,errcode, "pthread_join failed: %s",
-          strerror(errcode));
-   if (thread->exception)
-     free(thread->exception);
+void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return)
+{
 
-   if (thread == main_thread) /* just killed main thread */
-     main_thread = NULL;
+  int errcode;
 
-   free(thread);
+  if ((errcode = pthread_join(thread->t, thread_return)))
+    THROWF(system_error, errcode, "pthread_join failed: %s",
+           strerror(errcode));
+  xbt_os_thread_free_thread_data(thread);
 }
 
-void xbt_os_thread_exit(int *retval) {
-   pthread_exit(retval);
+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)
+{
   xbt_os_thread_t res;
 
   if (!thread_mod_inited)
     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 <sched.h>
-void xbt_os_thread_yield(void) {
-   sched_yield();
+void xbt_os_thread_yield(void)
+{
+  sched_yield();
 }
-void xbt_os_thread_cancel(xbt_os_thread_t t) {
-   pthread_cancel(t->t);
+
+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;
+  pthread_mutex_t m;
 } s_xbt_os_mutex_t;
 
 #include <time.h>
 #include <math.h>
 
-xbt_os_mutex_t xbt_os_mutex_init(void) {
-   xbt_os_mutex_t res = xbt_new(s_xbt_os_mutex_t,1);
-   int errcode;
+xbt_os_mutex_t xbt_os_mutex_init(void)
+{
+  xbt_os_mutex_t res = xbt_new(s_xbt_os_mutex_t, 1);
+  int errcode;
 
-   if ((errcode = pthread_mutex_init(&(res->m),NULL)))
-     THROW1(system_error,errcode,"pthread_mutex_init() failed: %s",
-           strerror(errcode));
+  if ((errcode = pthread_mutex_init(&(res->m), NULL)))
+    THROWF(system_error, errcode, "pthread_mutex_init() failed: %s",
+           strerror(errcode));
 
-   return res;
+  return res;
 }
 
-void xbt_os_mutex_acquire(xbt_os_mutex_t mutex) {
-   int errcode;
+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",
-           mutex, strerror(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:
-        THROW1(timeout_error,0,"mutex %p not ready",mutex);    
-       default:
-        THROW2(system_error,errcode,"xbt_mutex_tryacquire(%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_mutex_timedacquire(%p) failed: %s", mutex,
+             strerror(errcode));
+    }
+
+
+  } else {
 
-               
-   } 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);
-      DEBUG2("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);
-      
+    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)
-       errcode = ETIMEDOUT;
-      
-#endif /* HAVE_MUTEX_TIMEDLOCK */
-      
-      switch (errcode) {
-       case 0:
-        return;
-        
-       case ETIMEDOUT:
-        THROW2(timeout_error,delay,"mutex %p wasn't signaled before timeout (%f)",mutex,delay);
-        
-       default:
-        THROW3(system_error,errcode,"pthread_mutex_timedlock(%p,%f) failed: %s",mutex,delay, strerror(errcode));
-      }
-   }
+        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));
+    }
+  }
 }
 
-void xbt_os_mutex_release(xbt_os_mutex_t mutex) {
-   int errcode;
+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",
-           mutex, strerror(errcode));
+  if ((errcode = pthread_mutex_unlock(&(mutex->m))))
+    THROWF(system_error, errcode, "pthread_mutex_unlock(%p) failed: %s",
+           mutex, strerror(errcode));
 }
 
-void xbt_os_mutex_destroy(xbt_os_mutex_t mutex) {
-   int errcode;
+void xbt_os_mutex_destroy(xbt_os_mutex_t mutex)
+{
+  int errcode;
 
-   if (!mutex) return;
+  if (!mutex)
+    return;
 
-   if ((errcode=pthread_mutex_destroy(&(mutex->m))))
-     THROW2(system_error,errcode,"pthread_mutex_destroy(%p) failed: %s",
-           mutex, strerror(errcode));
-   free(mutex);
+  if ((errcode = pthread_mutex_destroy(&(mutex->m))))
+    THROWF(system_error, errcode, "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;
+  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)))
-     THROW1(system_error,errcode,"pthread_cond_init() failed: %s",
-           strerror(errcode));
+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;
+  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))))
-     THROW3(system_error,errcode,"pthread_cond_wait(%p,%p) failed: %s",
-           cond,mutex, strerror(errcode));
+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);
-      DEBUG3("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,"condition %p (mutex %p) wasn't signaled before timeout (%f)",
-               cond,mutex, delay);
-       default:
-        THROW4(system_error,errcode,"pthread_cond_timedwait(%p,%p,%f) failed: %s",
-               cond,mutex, delay, 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))))
-     THROW2(system_error,errcode,"pthread_cond_signal(%p) failed: %s",
-           cond, 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))))
-     THROW2(system_error,errcode,"pthread_cond_broadcast(%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;
+void xbt_os_cond_destroy(xbt_os_cond_t cond)
+{
+  int errcode;
 
-   if ((errcode=pthread_cond_destroy(&(cond->c))))
-     THROW2(system_error,errcode,"pthread_cond_destroy(%p) failed: %s",
-           cond, strerror(errcode));
-   free(cond);
+  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;
+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 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);
+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
-    */
+  /* 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)
-     THROW1(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.%d",(*xbt_getpid)(),++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);
-   }
-   if ((res->ps == (sem_t *)SEM_FAILED))
-     THROW1(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));
+  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, 1);
+  }
+  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;
+  return res;
 }
 
-void
-xbt_os_sem_acquire(xbt_os_sem_t sem) {
-   if(!sem)
-     THROW0(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));
+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;
+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();
 
-   if(!sem)
-     THROW0(arg_error,EINVAL,"Cannot acquire of the NULL semaphore");
+    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);
 
-   if (delay < 0) {
-      xbt_os_sem_acquire(sem);
-   } else if (delay==0) {
+#else                           /* Okay, reimplement this function then */
+    double start = xbt_os_time();
+    do {
       errcode = sem_trywait(sem->ps);
-
-      switch (errcode) {
-       case 0:
-        return;         
-       case ETIMEDOUT:
-        THROW1(timeout_error,0,"semaphore %p not ready",sem);
-       default:
-        THROW2(system_error,errcode,"xbt_sem_tryacquire(%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);
-      DEBUG2("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;
+        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:
-        THROW2(timeout_error,delay,"semaphore %p wasn't signaled before timeout (%f)",sem,delay);
+    switch (errcode) {
+    case 0:
+      return;
+
+    case ETIMEDOUT:
+      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,delay, strerror(errcode));
-      }
-   }
+    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)
+void xbt_os_sem_release(xbt_os_sem_t sem)
 {
-       if(!sem)
-               THROW0(arg_error,EINVAL,"Cannot release of the NULL semaphore");
+  if (!sem)
+    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));
+  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)
+void xbt_os_sem_destroy(xbt_os_sem_t sem)
 {
-   if(!sem)
-     THROW0(arg_error,EINVAL,"Cannot destroy the NULL sempahore");
+  if (!sem)
+    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));
-   xbt_free(sem->name);
+  if (sem_close(sem->ps) < 0)
+    THROWF(system_error, errno, "sem_close() failed: %s", strerror(errno));
+  xbt_free(sem->name);
 
 #endif
-   xbt_free(sem);
+  xbt_free(sem);
 }
 
-void
-xbt_os_sem_get_value(xbt_os_sem_t sem, int* svalue)
+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");
+  if (!sem)
+    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));
+  if (sem_getvalue(&(sem->s), svalue) < 0)
+    THROWF(system_error, errno, "sem_getvalue() failed: %s",
+           strerror(errno));
 }
 
 /* ********************************* WINDOWS IMPLEMENTATION ************************************ */
 
-#elif defined(WIN32)
+#elif defined(_XBT_WIN32)
 
 #include <math.h>
 
 typedef struct xbt_os_thread_ {
   char *name;
-  HANDLE handle;                  /* the win thread handle        */
-  unsigned long id;               /* the win thread id            */
+  HANDLE handle;                /* the win thread handle        */
+  unsigned long id;             /* the win thread id            */
   pvoid_f_pvoid_t start_routine;
-  void* param;
-} s_xbt_os_thread_t ;
+  void *param;
+  void *extra_data;
+} s_xbt_os_thread_t;
 
 /* so we can specify the size of the stack of the threads */
 #ifndef STACK_SIZE_PARAM_IS_A_RESERVATION
@@ -546,448 +643,585 @@ typedef struct xbt_os_thread_ {
 /* 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) {
-   xbt_self_thread_key = TlsAlloc();
+void xbt_os_thread_mod_preinit(void)
+{
+  xbt_self_thread_key = TlsAlloc();
+}
+
+void xbt_os_thread_mod_postexit(void)
+{
+
+  if (!TlsFree(xbt_self_thread_key))
+    THROWF(system_error, (int) GetLastError(),
+           "TlsFree() failed to cleanup the thread submodule");
 }
-void xbt_os_thread_mod_exit(void) {
 
-   if (!TlsFree(xbt_self_thread_key))
-     THROW0(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;
-  void* rv;
+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))
+    THROWF(system_error, (int) GetLastError(),
+           "TlsSetValue of data describing the created thread failed");
 
-    if(!TlsSetValue(xbt_self_thread_key,t))
-     THROW0(system_error,(int)GetLastError(),"TlsSetValue of data describing the created thread failed");
+  rv = (DWORD *) ((t->start_routine) (t->param));
 
-   rv = (*(t->start_routine))(t->param);
+  return rv ? *rv : 0;
 
-   return *((DWORD*)rv);
 }
 
 
-xbt_os_thread_t xbt_os_thread_create(const char *name,pvoid_f_pvoid_t start_routine,
-                              void* 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 t = xbt_new(s_xbt_os_thread_t,1);
+  xbt_os_thread_t t = xbt_new(s_xbt_os_thread_t, 1);
 
-   t->name = xbt_strdup(name);
-   t->start_routine = start_routine ;
-   t->param = param;
+  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));
 
-   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);
+    THROWF(system_error, (int) GetLastError(), "CreateThread failed");
+  }
 
-   if(!t->handle) {
-     xbt_free(t);
-     THROW0(system_error,(int)GetLastError(),"CreateThread failed");
-   }
+  return t;
+}
 
-   return t;
+const char *xbt_os_thread_name(xbt_os_thread_t t)
+{
+  return t->name;
 }
 
-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 t = xbt_os_thread_self();
+  return t ? t->name : "main";
 }
 
-const char* xbt_os_thread_self_name(void) {
-   xbt_os_thread_t t = xbt_os_thread_self();
-   return t?t->name:"main";
+void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return)
+{
+
+  if (WAIT_OBJECT_0 != WaitForSingleObject(thread->handle, INFINITE))
+    THROWF(system_error, (int) GetLastError(),
+           "WaitForSingleObject failed");
+
+  if (thread_return) {
+
+    if (!GetExitCodeThread(thread->handle, (DWORD *) (*thread_return)))
+      THROWF(system_error, (int) GetLastError(),
+             "GetExitCodeThread failed");
+  }
+
+  CloseHandle(thread->handle);
+
+  if (thread->name)
+    free(thread->name);
+
+  free(thread);
 }
 
-void
-xbt_os_thread_join(xbt_os_thread_t thread,void ** thread_return) {
+void xbt_os_thread_exit(int *retval)
+{
+  if (retval)
+    ExitThread(*retval);
+  else
+    ExitThread(0);
+}
 
-       if(WAIT_OBJECT_0 != WaitForSingleObject(thread->handle,INFINITE))
-               THROW0(system_error,(int)GetLastError(), "WaitForSingleObject failed");
+void xbt_os_thread_key_create(xbt_os_thread_key_t* key) {
 
-       if(thread_return){
+  *key = TlsAlloc();
+}
 
-               if(!GetExitCodeThread(thread->handle,(DWORD*)(*thread_return)))
-                       THROW0(system_error,(int)GetLastError(), "GetExitCodeThread failed");
-       }
+void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) {
 
-       CloseHandle(thread->handle);
-       free(thread->name);
-       free(thread);
+  if (!TlsSetValue(key, value))
+    THROWF(system_error, (int) GetLastError(), "TlsSetValue() failed");
 }
 
-void xbt_os_thread_exit(int *retval) {
-   if(retval)
-       ExitThread(*retval);
-   else
-       ExitThread(0);
+void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) {
+  return TlsGetValue(key);
 }
 
-xbt_os_thread_t xbt_os_thread_self(void) {
-   return TlsGetValue(xbt_self_thread_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);
 }
 
-void *xbt_os_thread_getparam(void) {
-   xbt_os_thread_t t = xbt_os_thread_self();
-   return t->param;
+void *xbt_os_thread_getparam(void)
+{
+  xbt_os_thread_t t = xbt_os_thread_self();
+  return t->param;
 }
 
 
-void xbt_os_thread_yield(void) {
-    Sleep(0);
+void xbt_os_thread_yield(void)
+{
+  Sleep(0);
 }
-void xbt_os_thread_cancel(xbt_os_thread_t t) {
-   THROW_UNIMPLEMENTED;
+
+void xbt_os_thread_cancel(xbt_os_thread_t t)
+{
+  if (!TerminateThread(t->handle, 0))
+    THROWF(system_error, (int) GetLastError(), "TerminateThread failed");
 }
 
 /****** mutex related functions ******/
 typedef struct xbt_os_mutex_ {
   /* KEEP IT IN SYNC WITH xbt_thread.c */
-   CRITICAL_SECTION lock;
+  CRITICAL_SECTION lock;
 } s_xbt_os_mutex_t;
 
-xbt_os_mutex_t xbt_os_mutex_init(void) {
-   xbt_os_mutex_t res = xbt_new(s_xbt_os_mutex_t,1);
-
-   /* initialize the critical section object */
-   InitializeCriticalSection(&(res->lock));
-
-   return res;
-}
+xbt_os_mutex_t xbt_os_mutex_init(void)
+{
+  xbt_os_mutex_t res = xbt_new(s_xbt_os_mutex_t, 1);
 
-void xbt_os_mutex_acquire(xbt_os_mutex_t mutex) {
+  /* initialize the critical section object */
+  InitializeCriticalSection(&(res->lock));
 
-   EnterCriticalSection(& mutex->lock);
+  return res;
 }
 
-void xbt_os_mutex_tryacquire(xbt_os_mutex_t mutex)
+void xbt_os_mutex_acquire(xbt_os_mutex_t mutex)
 {
-       TryEnterCriticalSection(&mutex->lock);
+  EnterCriticalSection(&mutex->lock);
 }
 
-void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) {
-       THROW_UNIMPLEMENTED;
+void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
+{
+  THROW_UNIMPLEMENTED;
 }
 
-void xbt_os_mutex_release(xbt_os_mutex_t mutex) {
+void xbt_os_mutex_release(xbt_os_mutex_t mutex)
+{
 
-   LeaveCriticalSection (&mutex->lock);
+  LeaveCriticalSection(&mutex->lock);
 
 }
 
-void xbt_os_mutex_destroy(xbt_os_mutex_t mutex) {
+void xbt_os_mutex_destroy(xbt_os_mutex_t mutex)
+{
 
-   if (!mutex) return;
+  if (!mutex)
+    return;
 
-   DeleteCriticalSection(& mutex->lock);
-   free(mutex);
+  DeleteCriticalSection(&mutex->lock);
+  free(mutex);
 }
 
 /***** condition related functions *****/
- enum { /* KEEP IT IN SYNC WITH xbt_thread.c */
-    SIGNAL = 0,
-    BROADCAST = 1,
-    MAX_EVENTS = 2
- };
+enum {                          /* KEEP IT IN SYNC WITH xbt_thread.c */
+  SIGNAL = 0,
+  BROADCAST = 1,
+  MAX_EVENTS = 2
+};
 
 typedef struct xbt_os_cond_ {
   /* KEEP IT IN SYNC WITH xbt_thread.c */
-   HANDLE events[MAX_EVENTS];
+  HANDLE events[MAX_EVENTS];
 
-   unsigned int waiters_count;           /* the number of waiters                        */
-   CRITICAL_SECTION waiters_count_lock;  /* protect access to waiters_count  */
+  unsigned int waiters_count;   /* the number of waiters                        */
+  CRITICAL_SECTION waiters_count_lock;  /* protect access to waiters_count  */
 } s_xbt_os_cond_t;
 
-xbt_os_cond_t xbt_os_cond_init(void) {
+xbt_os_cond_t xbt_os_cond_init(void)
+{
 
-   xbt_os_cond_t res = xbt_new0(s_xbt_os_cond_t,1);
+  xbt_os_cond_t res = xbt_new0(s_xbt_os_cond_t, 1);
 
-   memset(& res->waiters_count_lock,0,sizeof(CRITICAL_SECTION));
+  memset(&res->waiters_count_lock, 0, sizeof(CRITICAL_SECTION));
 
-   /* initialize the critical section object */
-   InitializeCriticalSection(& res->waiters_count_lock);
+  /* initialize the critical section object */
+  InitializeCriticalSection(&res->waiters_count_lock);
 
-   res->waiters_count = 0;
+  res->waiters_count = 0;
 
-   /* Create an auto-reset event */
-   res->events[SIGNAL] = CreateEvent (NULL, FALSE, FALSE, NULL);
+  /* Create an auto-reset event */
+  res->events[SIGNAL] = CreateEvent(NULL, FALSE, FALSE, NULL);
 
-   if(!res->events[SIGNAL]){
-      DeleteCriticalSection(& res->waiters_count_lock);
-      free(res);
-      THROW0(system_error,0,"CreateEvent failed for the signals");
-   }
+  if (!res->events[SIGNAL]) {
+    DeleteCriticalSection(&res->waiters_count_lock);
+    free(res);
+    THROWF(system_error, 0, "CreateEvent failed for the signals");
+  }
 
-   /* Create a manual-reset event. */
-   res->events[BROADCAST] = CreateEvent (NULL, TRUE, FALSE,NULL);
+  /* Create a manual-reset event. */
+  res->events[BROADCAST] = CreateEvent(NULL, TRUE, FALSE, NULL);
 
-   if(!res->events[BROADCAST]){
+  if (!res->events[BROADCAST]) {
 
-      DeleteCriticalSection(& res->waiters_count_lock);
-      CloseHandle(res->events[SIGNAL]);
-      free(res);
-      THROW0(system_error,0,"CreateEvent failed for the broadcasts");
-   }
+    DeleteCriticalSection(&res->waiters_count_lock);
+    CloseHandle(res->events[SIGNAL]);
+    free(res);
+    THROWF(system_error, 0, "CreateEvent failed for the broadcasts");
+  }
 
-   return res;
+  return res;
 }
 
-void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) {
+void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex)
+{
 
-   unsigned long wait_result;
-   int is_last_waiter;
+  unsigned long wait_result;
+  int is_last_waiter;
 
-   /* lock the threads counter and increment it */
-   EnterCriticalSection (& cond->waiters_count_lock);
-   cond->waiters_count++;
-   LeaveCriticalSection (& cond->waiters_count_lock);
+  /* lock the threads counter and increment it */
+  EnterCriticalSection(&cond->waiters_count_lock);
+  cond->waiters_count++;
+  LeaveCriticalSection(&cond->waiters_count_lock);
 
-   /* unlock the mutex associate with the condition */
-   LeaveCriticalSection (& mutex->lock);
+  /* unlock the mutex associate with the condition */
+  LeaveCriticalSection(&mutex->lock);
 
-   /* wait for a signal (broadcast or no) */
-   wait_result = WaitForMultipleObjects (2, cond->events, FALSE, INFINITE);
+  /* wait for a signal (broadcast or no) */
+  wait_result = WaitForMultipleObjects(2, cond->events, FALSE, INFINITE);
 
-   if(wait_result == WAIT_FAILED)
-     THROW0(system_error,0,"WaitForMultipleObjects failed, so we cannot wait on the condition");
+  if (wait_result == WAIT_FAILED)
+    THROWF(system_error, 0,
+           "WaitForMultipleObjects failed, so we cannot wait on the condition");
 
-   /* we have a signal lock the condition */
-   EnterCriticalSection (& cond->waiters_count_lock);
-   cond->waiters_count--;
+  /* we have a signal lock the condition */
+  EnterCriticalSection(&cond->waiters_count_lock);
+  cond->waiters_count--;
 
-   /* it's the last waiter or it's a broadcast ? */
-   is_last_waiter = ((wait_result == WAIT_OBJECT_0 + BROADCAST - 1) && (cond->waiters_count == 0));
+  /* it's the last waiter or it's a broadcast ? */
+  is_last_waiter = ((wait_result == WAIT_OBJECT_0 + BROADCAST - 1)
+                    && (cond->waiters_count == 0));
 
-   LeaveCriticalSection (& cond->waiters_count_lock);
+  LeaveCriticalSection(&cond->waiters_count_lock);
 
-   /* yes it's the last waiter or it's a broadcast
-    * only reset the manual event (the automatic event is reset in the WaitForMultipleObjects() function
-    * by the system.
-    */
-   if (is_last_waiter)
-      if(!ResetEvent (cond->events[BROADCAST]))
-       THROW0(system_error,0,"ResetEvent failed");
+  /* yes it's the last waiter or it's a broadcast
+   * only reset the manual event (the automatic event is reset in the WaitForMultipleObjects() function
+   * by the system.
+   */
+  if (is_last_waiter)
+    if (!ResetEvent(cond->events[BROADCAST]))
+      THROWF(system_error, 0, "ResetEvent failed");
 
-   /* relock the mutex associated with the condition in accordance with the posix thread specification */
-   EnterCriticalSection (& mutex->lock);
+  /* relock the mutex associated with the condition in accordance with the posix thread specification */
+  EnterCriticalSection(&mutex->lock);
 }
-void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, double delay) {
-
-   unsigned long wait_result = WAIT_TIMEOUT;
-   int is_last_waiter;
-   unsigned long end = (unsigned long)(delay * 1000);
-
-
-   if (delay < 0) {
-      xbt_os_cond_wait(cond,mutex);
-   } else {
-         DEBUG3("xbt_cond_timedwait(%p,%p,%ul)",&(cond->events),&(mutex->lock),end);
 
-   /* lock the threads counter and increment it */
-   EnterCriticalSection (& cond->waiters_count_lock);
-   cond->waiters_count++;
-   LeaveCriticalSection (& cond->waiters_count_lock);
-
-   /* unlock the mutex associate with the condition */
-   LeaveCriticalSection (& mutex->lock);
-   /* wait for a signal (broadcast or no) */
-
-   wait_result = WaitForMultipleObjects (2, cond->events, FALSE, end);
-
-   switch(wait_result) {
-     case WAIT_TIMEOUT:
-       THROW3(timeout_error,GetLastError(),"condition %p (mutex %p) wasn't signaled before timeout (%f)",cond,mutex, delay);
-       case WAIT_FAILED:
-     THROW0(system_error,GetLastError(),"WaitForMultipleObjects failed, so we cannot wait on the condition");
-   }
-
-   /* we have a signal lock the condition */
-   EnterCriticalSection (& cond->waiters_count_lock);
-   cond->waiters_count--;
-
-   /* it's the last waiter or it's a broadcast ? */
-   is_last_waiter = ((wait_result == WAIT_OBJECT_0 + BROADCAST - 1) && (cond->waiters_count == 0));
-
-   LeaveCriticalSection (& cond->waiters_count_lock);
-
-   /* yes it's the last waiter or it's a broadcast
-    * only reset the manual event (the automatic event is reset in the WaitForMultipleObjects() function
-    * by the system.
-    */
-   if (is_last_waiter)
-      if(!ResetEvent (cond->events[BROADCAST]))
-       THROW0(system_error,0,"ResetEvent failed");
+void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex,
+                           double delay)
+{
 
-   /* relock the mutex associated with the condition in accordance with the posix thread specification */
-   EnterCriticalSection (& mutex->lock);
-   }
-       /*THROW_UNIMPLEMENTED;*/
+  unsigned long wait_result = WAIT_TIMEOUT;
+  int is_last_waiter;
+  unsigned long end = (unsigned long) (delay * 1000);
+
+
+  if (delay < 0) {
+    xbt_os_cond_wait(cond, mutex);
+  } else {
+    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);
+    cond->waiters_count++;
+    LeaveCriticalSection(&cond->waiters_count_lock);
+
+    /* unlock the mutex associate with the condition */
+    LeaveCriticalSection(&mutex->lock);
+    /* wait for a signal (broadcast or no) */
+
+    wait_result = WaitForMultipleObjects(2, cond->events, FALSE, end);
+
+    switch (wait_result) {
+    case WAIT_TIMEOUT:
+      THROWF(timeout_error, GetLastError(),
+             "condition %p (mutex %p) wasn't signaled before timeout (%f)",
+             cond, mutex, delay);
+    case WAIT_FAILED:
+      THROWF(system_error, GetLastError(),
+             "WaitForMultipleObjects failed, so we cannot wait on the condition");
+    }
+
+    /* we have a signal lock the condition */
+    EnterCriticalSection(&cond->waiters_count_lock);
+    cond->waiters_count--;
+
+    /* it's the last waiter or it's a broadcast ? */
+    is_last_waiter = ((wait_result == WAIT_OBJECT_0 + BROADCAST - 1)
+                      && (cond->waiters_count == 0));
+
+    LeaveCriticalSection(&cond->waiters_count_lock);
+
+    /* yes it's the last waiter or it's a broadcast
+     * only reset the manual event (the automatic event is reset in the WaitForMultipleObjects() function
+     * by the system.
+     */
+    if (is_last_waiter)
+      if (!ResetEvent(cond->events[BROADCAST]))
+        THROWF(system_error, 0, "ResetEvent failed");
+
+    /* relock the mutex associated with the condition in accordance with the posix thread specification */
+    EnterCriticalSection(&mutex->lock);
+  }
+  /*THROW_UNIMPLEMENTED; */
 }
 
-void xbt_os_cond_signal(xbt_os_cond_t cond) {
-   int have_waiters;
+void xbt_os_cond_signal(xbt_os_cond_t cond)
+{
+  int have_waiters;
 
-   EnterCriticalSection (& cond->waiters_count_lock);
-   have_waiters = cond->waiters_count > 0;
-   LeaveCriticalSection (& cond->waiters_count_lock);
+  EnterCriticalSection(&cond->waiters_count_lock);
+  have_waiters = cond->waiters_count > 0;
+  LeaveCriticalSection(&cond->waiters_count_lock);
 
-   if (have_waiters)
-     if(!SetEvent(cond->events[SIGNAL]))
-       THROW0(system_error,0,"SetEvent failed");
+  if (have_waiters)
+    if (!SetEvent(cond->events[SIGNAL]))
+      THROWF(system_error, 0, "SetEvent failed");
 
-   xbt_os_thread_yield();
+  xbt_os_thread_yield();
 }
 
-void xbt_os_cond_broadcast(xbt_os_cond_t cond){
-   int have_waiters;
+void xbt_os_cond_broadcast(xbt_os_cond_t cond)
+{
+  int have_waiters;
 
-   EnterCriticalSection (& cond->waiters_count_lock);
-   have_waiters = cond->waiters_count > 0;
-   LeaveCriticalSection (& cond->waiters_count_lock);
+  EnterCriticalSection(&cond->waiters_count_lock);
+  have_waiters = cond->waiters_count > 0;
+  LeaveCriticalSection(&cond->waiters_count_lock);
 
-   if (have_waiters)
-     SetEvent(cond->events[BROADCAST]);
+  if (have_waiters)
+    SetEvent(cond->events[BROADCAST]);
 }
 
-void xbt_os_cond_destroy(xbt_os_cond_t cond){
-   int error = 0;
+void xbt_os_cond_destroy(xbt_os_cond_t cond)
+{
+  int error = 0;
 
-   if (!cond) return;
+  if (!cond)
+    return;
 
-   if(!CloseHandle(cond->events[SIGNAL]))
-     error = 1;
+  if (!CloseHandle(cond->events[SIGNAL]))
+    error = 1;
 
-   if(!CloseHandle(cond->events[BROADCAST]))
-     error = 1;
+  if (!CloseHandle(cond->events[BROADCAST]))
+    error = 1;
 
-   DeleteCriticalSection(& cond->waiters_count_lock);
+  DeleteCriticalSection(&cond->waiters_count_lock);
 
-   xbt_free(cond);
+  xbt_free(cond);
 
-   if (error)
-     THROW0(system_error,0,"Error while destroying the condition");
+  if (error)
+    THROWF(system_error, 0, "Error while destroying the condition");
 }
 
 typedef struct xbt_os_sem_ {
-   HANDLE h;
-   unsigned int value;
-   CRITICAL_SECTION value_lock;  /* protect access to value of the semaphore  */
-}s_xbt_os_sem_t ;
+  HANDLE h;
+  unsigned int value;
+  CRITICAL_SECTION value_lock;  /* protect access to value of the semaphore  */
+} s_xbt_os_sem_t;
 
-xbt_os_sem_t
-xbt_os_sem_init(unsigned int value)
+#ifndef INT_MAX
+# define INT_MAX 32767          /* let's be safe by underestimating this value: this is for 16bits only */
+#endif
+
+xbt_os_sem_t xbt_os_sem_init(unsigned int value)
 {
-       xbt_os_sem_t res;
+  xbt_os_sem_t res;
 
-       if(value > INT_MAX)
-       THROW1(arg_error,value,"Semaphore initial value too big: %ud cannot be stored as a signed int",value);
+  if (value > INT_MAX)
+    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);
+  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",
-           strerror(GetLastError()));
-           return NULL;
-       }
+  if (!(res->h = CreateSemaphore(NULL, value, (long) INT_MAX, NULL))) {
+    THROWF(system_error, GetLastError(), "CreateSemaphore() failed: %s",
+           strerror(GetLastError()));
+    return NULL;
+  }
 
-       res->value = value;
+  res->value = value;
 
-       InitializeCriticalSection(&(res->value_lock));
+  InitializeCriticalSection(&(res->value_lock));
 
-       return res;
+  return res;
 }
 
-void
-xbt_os_sem_acquire(xbt_os_sem_t sem)
+void xbt_os_sem_acquire(xbt_os_sem_t sem)
 {
-       if(!sem)
-               THROW0(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()));
-       EnterCriticalSection(&(sem->value_lock));
-       sem->value--;
-       LeaveCriticalSection(&(sem->value_lock));
+  if (!sem)
+    THROWF(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
+
+  /* wait failure */
+  if (WAIT_OBJECT_0 != WaitForSingleObject(sem->h, INFINITE))
+    THROWF(system_error, GetLastError(),
+           "WaitForSingleObject() failed: %s", strerror(GetLastError()));
+  EnterCriticalSection(&(sem->value_lock));
+  sem->value--;
+  LeaveCriticalSection(&(sem->value_lock));
 }
 
 void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double timeout)
 {
-       long seconds;
-       long milliseconds;
-       double end = timeout + xbt_os_time();
+  long seconds;
+  long milliseconds;
+  double end = timeout + xbt_os_time();
+
+  if (!sem)
+    THROWF(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
+
+  if (timeout < 0) {
+    xbt_os_sem_acquire(sem);
+  } else {                      /* timeout can be zero <-> try acquire ) */
+
+
+    seconds = (long) floor(end);
+    milliseconds = (long) ((end - seconds) * 1000);
+    milliseconds += (seconds * 1000);
+
+    switch (WaitForSingleObject(sem->h, milliseconds)) {
+    case WAIT_OBJECT_0:
+      EnterCriticalSection(&(sem->value_lock));
+      sem->value--;
+      LeaveCriticalSection(&(sem->value_lock));
+      return;
+
+    case WAIT_TIMEOUT:
+      THROWF(timeout_error, GetLastError(),
+             "semaphore %p wasn't signaled before timeout (%f)", sem,
+             timeout);
+      return;
+
+    default:
+      THROWF(system_error, GetLastError(),
+             "WaitForSingleObject(%p,%f) failed: %s", sem, timeout,
+             strerror(GetLastError()));
+    }
+  }
+}
 
-       if(!sem)
-               THROW0(arg_error,EINVAL,"Cannot acquire the NULL semaphore");
+void xbt_os_sem_release(xbt_os_sem_t sem)
+{
+  if (!sem)
+    THROWF(arg_error, EINVAL, "Cannot release the NULL semaphore");
+
+  if (!ReleaseSemaphore(sem->h, 1, NULL))
+    THROWF(system_error, GetLastError(), "ReleaseSemaphore() failed: %s",
+           strerror(GetLastError()));
+  EnterCriticalSection(&(sem->value_lock));
+  sem->value++;
+  LeaveCriticalSection(&(sem->value_lock));
+}
 
-       if (timeout < 0)
-       {
-               xbt_os_sem_acquire(sem);
-       }
-       else /* timeout can be zero <-> try acquire ) */
-       {
+void xbt_os_sem_destroy(xbt_os_sem_t sem)
+{
+  if (!sem)
+    THROWF(arg_error, EINVAL, "Cannot destroy the NULL semaphore");
 
-               seconds = (long) floor(end);
-               milliseconds = (long)( ( end - seconds) * 1000);
-               milliseconds += (seconds * 1000);
+  if (!CloseHandle(sem->h))
+    THROWF(system_error, GetLastError(), "CloseHandle() failed: %s",
+           strerror(GetLastError()));
 
-               switch(WaitForSingleObject(sem->h,milliseconds))
-               {
-                       case WAIT_OBJECT_0:
-                       EnterCriticalSection(&(sem->value_lock));
-                       sem->value--;
-                       LeaveCriticalSection(&(sem->value_lock));
-                       return;
+  DeleteCriticalSection(&(sem->value_lock));
 
-                       case WAIT_TIMEOUT:
-                       THROW2(timeout_error,GetLastError(),"semaphore %p wasn't signaled before timeout (%f)",sem,timeout);
-                       return;
+  xbt_free(sem);
 
-                       default:
-                       THROW3(system_error,GetLastError(),"WaitForSingleObject(%p,%f) failed: %s",sem,timeout, strerror(GetLastError()));
-               }
-       }
 }
 
-void
-xbt_os_sem_release(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 release the NULL semaphore");
+  if (!sem)
+    THROWF(arg_error, EINVAL,
+           "Cannot get the value of the NULL semaphore");
 
-       if(!ReleaseSemaphore(sem->h,1, NULL))
-               THROW1(system_error,GetLastError(),"ReleaseSemaphore() failed: %s",
-               strerror(GetLastError()));
-       EnterCriticalSection (&(sem->value_lock));
-       sem->value++;
-       LeaveCriticalSection(&(sem->value_lock));
+  EnterCriticalSection(&(sem->value_lock));
+  *svalue = sem->value;
+  LeaveCriticalSection(&(sem->value_lock));
 }
 
-void
-xbt_os_sem_destroy(xbt_os_sem_t sem)
-{
-       if(!sem)
-               THROW0(arg_error,EINVAL,"Cannot destroy the NULL semaphore");
 
-       if(!CloseHandle(sem->h))
-               THROW1(system_error,GetLastError(),"CloseHandle() failed: %s",
-               strerror(GetLastError()));
+#endif
 
-        DeleteCriticalSection(&(sem->value_lock));
+/***** 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_free(sem);
+void xbt_os_thread_set_extra_data(void *data)
+{
+  xbt_os_thread_self()->extra_data = data;
+}
 
+void *xbt_os_thread_get_extra_data(void)
+{
+  return xbt_os_thread_self()->extra_data;
 }
 
-void
-xbt_os_sem_get_value(xbt_os_sem_t sem, int* svalue)
+xbt_os_rmutex_t xbt_os_rmutex_init(void)
 {
-       if(!sem)
-               THROW0(arg_error,EINVAL,"Cannot get the value of the NULL semaphore");
+  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;
+}
 
-       EnterCriticalSection(&(sem->value_lock));
-       *svalue = sem->value;
-       LeaveCriticalSection(&(sem->value_lock));
+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++;
+ }
 }
 
-#endif
+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);
+}