- /** \brief Thread data type (opaque structure) */
- typedef struct s_xbt_thread_ *xbt_thread_t;
-
- XBT_PUBLIC(xbt_thread_t) xbt_thread_create(void_f_pvoid_t start_routine,void* param);
- XBT_PUBLIC(void) xbt_thread_exit();
- XBT_PUBLIC(xbt_thread_t) xbt_thread_self(void);
- /* xbt_thread_join frees the joined thread (ie the XBT wrapper around it, the OS frees the rest) */
- XBT_PUBLIC(void) xbt_thread_join(xbt_thread_t thread);
- /* Brutally ends the life of the poor victim */
- XBT_PUBLIC(void) xbt_thread_destroy(xbt_thread_t thread);
- /* suicide */
- XBT_PUBLIC(void) xbt_thread_exit(void);
- /* current thread pass control to any possible thread wanting it */
- XBT_PUBLIC(void) xbt_thread_yield(void);
-
-
- /** \brief Thread mutex data type (opaque structure) */
- typedef struct s_xbt_mutex_ *xbt_mutex_t;
-
- XBT_PUBLIC(xbt_mutex_t) xbt_mutex_init(void);
- XBT_PUBLIC(void) xbt_mutex_lock(xbt_mutex_t mutex);
- XBT_PUBLIC(void) xbt_mutex_unlock(xbt_mutex_t mutex);
- XBT_PUBLIC(void) xbt_mutex_destroy(xbt_mutex_t mutex);
+/** @brief Thread mutex data type (opaque object)
+ * @hideinitializer
+ */
+#ifdef __cplusplus
+typedef simgrid::kernel::activity::MutexImpl* xbt_mutex_t;
+#else
+typedef struct s_smx_mutex_* xbt_mutex_t;
+#endif
+
+/** @brief Creates a new mutex variable */
+XBT_PUBLIC xbt_mutex_t xbt_mutex_init(void);
+
+/** @brief Blocks onto the given mutex variable */
+XBT_PUBLIC void xbt_mutex_acquire(xbt_mutex_t mutex);
+
+/** @brief Tries to block onto the given mutex variable
+ * Tries to lock a mutex, return 1 if the mutex is unlocked, else 0.
+ * This function does not block and wait for the mutex to be unlocked.
+ * @param mutex The mutex
+ * @return 1 - mutex free, 0 - mutex used
+ */
+XBT_PUBLIC int xbt_mutex_try_acquire(xbt_mutex_t mutex);