A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep deprecated features one more release (target: 1 year).
[simgrid.git]
/
include
/
xbt
/
synchro.h
diff --git
a/include/xbt/synchro.h
b/include/xbt/synchro.h
index
a4923d2
..
1be5b5f
100644
(file)
--- a/
include/xbt/synchro.h
+++ b/
include/xbt/synchro.h
@@
-1,6
+1,6
@@
/* xbt/synchro.h -- Simulated synchronization */
/* xbt/synchro.h -- Simulated synchronization */
-/* Copyright (c) 2009-201
8
. The SimGrid Team. */
+/* Copyright (c) 2009-201
9
. The SimGrid Team. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-27,13
+27,17
@@
SG_BEGIN_DECL()
/** @brief Thread mutex data type (opaque object)
* @hideinitializer
*/
/** @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;
typedef struct s_smx_mutex_* xbt_mutex_t;
+#endif
/** @brief Creates a new mutex variable */
/** @brief Creates a new mutex variable */
-XBT_PUBLIC xbt_mutex_t xbt_mutex_init(void);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_mutex_init") XBT_
PUBLIC xbt_mutex_t xbt_mutex_init(void);
/** @brief Blocks onto the given mutex variable */
/** @brief Blocks onto the given mutex variable */
-XBT_PUBLIC void xbt_mutex_acquire(xbt_mutex_t mutex);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_mutex_lock") 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.
/** @brief Tries to block onto the given mutex variable
* Tries to lock a mutex, return 1 if the mutex is unlocked, else 0.
@@
-41,13
+45,13
@@
XBT_PUBLIC void xbt_mutex_acquire(xbt_mutex_t mutex);
* @param mutex The mutex
* @return 1 - mutex free, 0 - mutex used
*/
* @param mutex The mutex
* @return 1 - mutex free, 0 - mutex used
*/
-XBT_PUBLIC int xbt_mutex_try_acquire(xbt_mutex_t mutex);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_mutex_try_lock") XBT_
PUBLIC int xbt_mutex_try_acquire(xbt_mutex_t mutex);
/** @brief Releases the given mutex variable */
/** @brief Releases the given mutex variable */
-XBT_PUBLIC void xbt_mutex_release(xbt_mutex_t mutex);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_mutex_unlock") XBT_
PUBLIC void xbt_mutex_release(xbt_mutex_t mutex);
/** @brief Destroyes the given mutex variable */
/** @brief Destroyes the given mutex variable */
-XBT_PUBLIC void xbt_mutex_destroy(xbt_mutex_t mutex);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_mutex_destroy") XBT_
PUBLIC void xbt_mutex_destroy(xbt_mutex_t mutex);
/** @brief Thread condition data type (opaque object)
* @hideinitializer
/** @brief Thread condition data type (opaque object)
* @hideinitializer
@@
-59,19
+63,20
@@
typedef struct s_smx_cond_* xbt_cond_t;
#endif
/** @brief Creates a condition variable */
#endif
/** @brief Creates a condition variable */
-XBT_PUBLIC xbt_cond_t xbt_cond_init(void);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_cond_init") XBT_
PUBLIC xbt_cond_t xbt_cond_init(void);
/** @brief Blocks onto the given condition variable */
/** @brief Blocks onto the given condition variable */
-XBT_PUBLIC void xbt_cond_wait(xbt_cond_t cond, xbt_mutex_t mutex);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_cond_wait") XBT_
PUBLIC void xbt_cond_wait(xbt_cond_t cond, xbt_mutex_t mutex);
/** @brief Blocks onto the given condition variable, but only for the given amount of time.
* @return 0 on success, 1 on timeout */
/** @brief Blocks onto the given condition variable, but only for the given amount of time.
* @return 0 on success, 1 on timeout */
-XBT_PUBLIC int xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_wait_for") XBT_PUBLIC
+ int xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay);
/** @brief Signals the given mutex variable */
/** @brief Signals the given mutex variable */
-XBT_PUBLIC void xbt_cond_signal(xbt_cond_t cond);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_cond_notify_one") XBT_
PUBLIC void xbt_cond_signal(xbt_cond_t cond);
/** @brief Broadcasts the given mutex variable */
/** @brief Broadcasts the given mutex variable */
-XBT_PUBLIC void xbt_cond_broadcast(xbt_cond_t cond);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_cond_notify_all") XBT_
PUBLIC void xbt_cond_broadcast(xbt_cond_t cond);
/** @brief Destroys the given mutex variable */
/** @brief Destroys the given mutex variable */
-XBT_PUBLIC void xbt_cond_destroy(xbt_cond_t cond);
+XBT_
ATTRIB_DEPRECATED_v328("Please use sg_cond_destroy") XBT_
PUBLIC void xbt_cond_destroy(xbt_cond_t cond);
/** @} */
/** @} */