get rid of xbt_os_thread_yield() using C++11

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

diff --git a/include/xbt/xbt_os_thread.h b/include/xbt/xbt_os_thread.h
index f0e976b..e1591c7 100644 (file)
--- a/include/xbt/xbt_os_thread.h
+++ b/include/xbt/xbt_os_thread.h
@@ -8,12 +8,12 @@
 #ifndef XBT_OS_THREAD_H
 #define XBT_OS_THREAD_H
 
-#include "xbt/base.h"
-
-SG_BEGIN_DECL()
+#include <xbt/base.h>
+#include <xbt/function_types.h>
 
 #include <pthread.h>
-typedef pthread_key_t xbt_os_thread_key_t;
+
+SG_BEGIN_DECL()
 
 /** @addtogroup XBT_thread
  *  @brief Thread portability layer
@@ -26,7 +26,7 @@ typedef pthread_key_t xbt_os_thread_key_t;
 
 XBT_PUBLIC int xbt_os_get_numcores(void);
 
-/** \brief Thread data type (opaque structure) */
+/** @brief Thread data type (opaque structure) */
 typedef struct xbt_os_thread_ *xbt_os_thread_t;
 XBT_PUBLIC xbt_os_thread_t xbt_os_thread_create(const char* name, pvoid_f_pvoid_t start_routine, void* param,
                                                 void* data);
@@ -36,34 +36,21 @@ XBT_PUBLIC xbt_os_thread_t xbt_os_thread_self(void);
 XBT_PUBLIC const char* xbt_os_thread_self_name(void);
 XBT_PUBLIC void xbt_os_thread_set_extra_data(void* data);
 XBT_PUBLIC void* xbt_os_thread_get_extra_data(void);
-XBT_PUBLIC void xbt_os_thread_key_create(xbt_os_thread_key_t* key);
-XBT_PUBLIC void xbt_os_thread_key_destroy(xbt_os_thread_key_t key);
-XBT_PUBLIC void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value);
-XBT_PUBLIC void* xbt_os_thread_get_specific(xbt_os_thread_key_t key);
 /* 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);
-XBT_PUBLIC void xbt_os_thread_yield(void);
 XBT_PUBLIC void xbt_os_thread_setstacksize(int stack_size);
 XBT_PUBLIC void xbt_os_thread_setguardsize(int guard_size);
 XBT_PUBLIC int xbt_os_thread_bind(xbt_os_thread_t thread, int core);
 XBT_PUBLIC int xbt_os_thread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void));
 
-/** \brief Thread mutex data type (opaque structure) */
+/** @brief Thread mutex data type (opaque structure) */
 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);
 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 condition data type (opaque structure) */
-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_signal(xbt_os_cond_t cond);
-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) */
+/** @brief Semaphore data type (opaque structure) */
 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);