Implement reentrant mutexes in xbt_os_thread

[simgrid.git] / src / include / xbt / xbt_os_thread.h

diff --git a/src/include/xbt/xbt_os_thread.h b/src/include/xbt/xbt_os_thread.h
index 03f45a2..597815d 100644 (file)
--- a/src/include/xbt/xbt_os_thread.h
+++ b/src/include/xbt/xbt_os_thread.h
@@ -24,15 +24,28 @@ SG_BEGIN_DECL()
  *  @{
  */
   /** \brief Thread data type (opaque structure) */
-     typedef struct xbt_os_thread_ *xbt_os_thread_t;
+typedef struct xbt_os_thread_ *xbt_os_thread_t;
+
+/* Calls pthread_atfork() if present, and else does nothing.
+ * The only known user of this wrapper is mmalloc_preinit().
+ */
+XBT_PUBLIC(int) xbt_os_thread_atfork(void (*prepare)(void),
+                                     void (*parent)(void),
+                                     void (*child)(void));
+
 
 XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_create(const char *name,
-                                                 pvoid_f_pvoid_t
-                                                 start_routine, void *param);
+                                                 pvoid_f_pvoid_t start_routine,
+                                                 void *param,
+                                                 void *data);
+
 XBT_PUBLIC(void) xbt_os_thread_exit(int *retcode);
+XBT_PUBLIC(void) xbt_os_thread_detach(xbt_os_thread_t thread);
 XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_self(void);
 XBT_PUBLIC(const char *) xbt_os_thread_self_name(void);
 XBT_PUBLIC(const char *) xbt_os_thread_name(xbt_os_thread_t);
+XBT_PUBLIC(void) xbt_os_thread_set_extra_data(void *data);
+XBT_PUBLIC(void *) xbt_os_thread_get_extra_data(void);
   /* xbt_os_thread_join frees the joined thread (ie the XBT wrapper around it, the OS frees the rest) */
 XBT_PUBLIC(void) xbt_os_thread_join(xbt_os_thread_t thread,
                                     void **thread_return);
@@ -42,7 +55,7 @@ XBT_PUBLIC(void *) xbt_os_thread_getparam(void);
 
 
   /** \brief Thread mutex data type (opaque structure) */
-     typedef struct xbt_os_mutex_ *xbt_os_mutex_t;
+typedef struct xbt_os_mutex_ *xbt_os_mutex_t;
 
 XBT_PUBLIC(xbt_os_mutex_t) xbt_os_mutex_init(void);
 XBT_PUBLIC(void) xbt_os_mutex_acquire(xbt_os_mutex_t mutex);
@@ -51,12 +64,21 @@ XBT_PUBLIC(void) xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex,
 XBT_PUBLIC(void) xbt_os_mutex_release(xbt_os_mutex_t mutex);
 XBT_PUBLIC(void) xbt_os_mutex_destroy(xbt_os_mutex_t mutex);
 
+/** \brief Thread reentrant mutex data type (opaque structure) */
+typedef struct xbt_os_rmutex_ *xbt_os_rmutex_t;
+
+XBT_PUBLIC(xbt_os_rmutex_t) xbt_os_rmutex_init(void);
+XBT_PUBLIC(void) xbt_os_rmutex_acquire(xbt_os_rmutex_t rmutex);
+XBT_PUBLIC(void) xbt_os_rmutex_release(xbt_os_rmutex_t rmutex);
+XBT_PUBLIC(void) xbt_os_rmutex_destroy(xbt_os_rmutex_t rmutex);
+
 
   /** \brief Thread condition data type (opaque structure) */
-     typedef struct xbt_os_cond_ *xbt_os_cond_t;
+typedef struct xbt_os_cond_ *xbt_os_cond_t;
 
 XBT_PUBLIC(xbt_os_cond_t) xbt_os_cond_init(void);
-XBT_PUBLIC(void) xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex);
+XBT_PUBLIC(void) xbt_os_cond_wait(xbt_os_cond_t cond,
+                                  xbt_os_mutex_t mutex);
 XBT_PUBLIC(void) xbt_os_cond_timedwait(xbt_os_cond_t cond,
                                        xbt_os_mutex_t mutex, double delay);
 XBT_PUBLIC(void) xbt_os_cond_signal(xbt_os_cond_t cond);
@@ -64,7 +86,7 @@ XBT_PUBLIC(void) xbt_os_cond_broadcast(xbt_os_cond_t cond);
 XBT_PUBLIC(void) xbt_os_cond_destroy(xbt_os_cond_t cond);
 
    /** \brief Semaphore data type (opaque structure) */
-     typedef struct xbt_os_sem_ *xbt_os_sem_t;
+typedef struct xbt_os_sem_ *xbt_os_sem_t;
 
 XBT_PUBLIC(xbt_os_sem_t) xbt_os_sem_init(unsigned int value);
 XBT_PUBLIC(void) xbt_os_sem_acquire(xbt_os_sem_t sem);
@@ -77,4 +99,4 @@ XBT_PUBLIC(void) xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue);
 /** @} */
 
 SG_END_DECL()
-#endif /* _XBT_OS_THREAD_H */
+#endif                          /* _XBT_OS_THREAD_H */