X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0cf99d650f27689b97ddcce0582fdf9d6588da7..797980252c46782a2b6afdc729088af5acff79bf:/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 3f9122b0d1..f69276c0cd 100644 --- a/src/include/xbt/xbt_os_thread.h +++ b/src/include/xbt/xbt_os_thread.h @@ -14,6 +14,11 @@ #include "xbt/misc.h" /* SG_BEGIN_DECL */ #include "xbt/function_types.h" +#ifndef WIN32 /* HAVE_SEMAPHOR_H */ +#include +#endif + + SG_BEGIN_DECL() /** @addtogroup XBT_thread @@ -28,9 +33,11 @@ SG_BEGIN_DECL() /** \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(pvoid_f_pvoid_t start_routine,void* param); + XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_create(const char *name,pvoid_f_pvoid_t start_routine,void* param); XBT_PUBLIC(void) xbt_os_thread_exit(int *retcode); 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_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); @@ -42,8 +49,8 @@ SG_BEGIN_DECL() 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_lock(xbt_os_mutex_t mutex); - XBT_PUBLIC(void) xbt_os_mutex_unlock(xbt_os_mutex_t mutex); + 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); @@ -59,6 +66,17 @@ SG_BEGIN_DECL() 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) */ + 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); + XBT_PUBLIC(void) xbt_os_sem_timedacquire(xbt_os_sem_t sem,double timeout); + XBT_PUBLIC(void) xbt_os_sem_release(xbt_os_sem_t sem); + XBT_PUBLIC(void) xbt_os_sem_destroy(xbt_os_sem_t sem); + XBT_PUBLIC(void) xbt_os_sem_get_value(xbt_os_sem_t sem, int* svalue); + /** @} */