This change is about the refactoring of the source code of the objects use int the...

[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 b3860d5..f69276c 100644 (file)
--- 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 <semaphore.h>
+#endif
+
+
 SG_BEGIN_DECL()
 
 /** @addtogroup XBT_thread
@@ -31,6 +36,8 @@ SG_BEGIN_DECL()
   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);
+ 
 
 /** @} */