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
added circle placement for ns3 wifi nodes
[simgrid.git]
/
include
/
xbt
/
synchro.h
diff --git
a/include/xbt/synchro.h
b/include/xbt/synchro.h
index 96d7556e3d638cf30abd2ea8501e51f7cc4346c5..f1b87220d7302cce7c897f77885f549c0c3ec6ea 100644
(file)
--- a/
include/xbt/synchro.h
+++ b/
include/xbt/synchro.h
@@
-1,18
+1,20
@@
/* xbt/synchro.h -- Simulated synchronization */
/* xbt/synchro.h -- Simulated synchronization */
-/* Copyright (c) 2009-20
19
. The SimGrid Team. */
+/* Copyright (c) 2009-20
20
. 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. */
-#ifndef XBT_
THREAD
_H
-#define XBT_
THREAD
_H
+#ifndef XBT_
SYNCHRO
_H
+#define XBT_
SYNCHRO
_H
-#include "simgrid/
forwar
d.h"
-#include
<xbt/function_types.h>
+#include "simgrid/
con
d.h"
+#include
"simgrid/mutex.h"
#include <xbt/misc.h> /* SG_BEGIN_DECL */
#include <xbt/misc.h> /* SG_BEGIN_DECL */
-SG_BEGIN_DECL()
+#warning xbt/synchro.h is deprecated and will be removed in v3.28.
+
+SG_BEGIN_DECL
/** @addtogroup XBT_synchro
* @brief XBT synchronization tools
/** @addtogroup XBT_synchro
* @brief XBT synchronization tools
@@
-27,17
+29,19
@@
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;
-#endif
+typedef sg_mutex_t xbt_mutex_t;
/** @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") static inline xbt_mutex_t xbt_mutex_init(void)
+{
+ return sg_mutex_init();
+}
/** @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") static inline void xbt_mutex_acquire(xbt_mutex_t mutex)
+{
+ sg_mutex_lock(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.
@@
-45,39
+49,69
@@
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") static inline int xbt_mutex_try_acquire(xbt_mutex_t mutex)
+{
+ return sg_mutex_try_lock(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") static inline void xbt_mutex_release(xbt_mutex_t mutex)
+{
+ sg_mutex_unlock(mutex);
+}
-/** @brief Destroyes the given mutex variable */
-XBT_PUBLIC void xbt_mutex_destroy(xbt_mutex_t mutex);
+/** @brief Destroys the given mutex variable */
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_destroy") static inline void xbt_mutex_destroy(xbt_mutex_t mutex)
+{
+ sg_mutex_destroy(mutex);
+}
/** @brief Thread condition data type (opaque object)
* @hideinitializer
*/
/** @brief Thread condition data type (opaque object)
* @hideinitializer
*/
-#ifdef __cplusplus
-typedef simgrid::kernel::activity::ConditionVariableImpl* xbt_cond_t;
-#else
-typedef struct s_smx_cond_* xbt_cond_t;
-#endif
+typedef sg_cond_t xbt_cond_t;
/** @brief Creates a condition variable */
/** @brief Creates a condition variable */
-XBT_PUBLIC xbt_cond_t xbt_cond_init(void);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_init") static inline xbt_cond_t xbt_cond_init(void)
+{
+ return sg_cond_init();
+}
/** @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") static inline void xbt_cond_wait(xbt_cond_t cond,
+ xbt_mutex_t mutex)
+{
+ sg_cond_wait(cond, 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") static inline int xbt_cond_timedwait(xbt_cond_t cond,
+ xbt_mutex_t mutex,
+ double delay)
+{
+ return sg_cond_wait_for(cond, mutex, 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") static inline void xbt_cond_signal(xbt_cond_t cond)
+{
+ sg_cond_notify_one(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") static inline void xbt_cond_broadcast(xbt_cond_t cond)
+{
+ sg_cond_notify_all(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") static inline void xbt_cond_destroy(xbt_cond_t cond)
+{
+ sg_cond_destroy(cond);
+}
/** @} */
/** @} */
-SG_END_DECL
()
-#endif /*
_XBT_THREAD
_H */
+SG_END_DECL
+#endif /*
XBT_SYNCHRO
_H */