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
small changes
[simgrid.git]
/
src
/
xbt
/
xbt_os_synchro.c
diff --git
a/src/xbt/xbt_os_synchro.c
b/src/xbt/xbt_os_synchro.c
index
fd52a4d
..
22a4908
100644
(file)
--- a/
src/xbt/xbt_os_synchro.c
+++ b/
src/xbt/xbt_os_synchro.c
@@
-13,16
+13,10
@@
#include "xbt/synchro_core.h"
#include "simgrid/simix.h" /* used implementation */
#include "xbt/synchro_core.h"
#include "simgrid/simix.h" /* used implementation */
-#include "../simix/smx_private.h" /* FIXME */
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
- "Synchronization mechanism");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt, "Synchronization mechanism");
/****** mutex related functions ******/
/****** mutex related functions ******/
-struct s_xbt_mutex_ {
- s_smx_mutex_t mutex;
-};
-
xbt_mutex_t xbt_mutex_init(void)
{
return (xbt_mutex_t) simcall_mutex_init();
xbt_mutex_t xbt_mutex_init(void)
{
return (xbt_mutex_t) simcall_mutex_init();
@@
-45,14
+39,10
@@
void xbt_mutex_release(xbt_mutex_t mutex)
void xbt_mutex_destroy(xbt_mutex_t mutex)
{
void xbt_mutex_destroy(xbt_mutex_t mutex)
{
- SIMIX_mutex_
destroy
((smx_mutex_t) mutex);
+ SIMIX_mutex_
unref
((smx_mutex_t) mutex);
}
/***** condition related functions *****/
}
/***** condition related functions *****/
-struct s_xbt_cond_ {
- s_smx_cond_t cond;
-};
-
xbt_cond_t xbt_cond_init(void)
{
return (xbt_cond_t) simcall_cond_init();
xbt_cond_t xbt_cond_init(void)
{
return (xbt_cond_t) simcall_cond_init();
@@
-80,7
+70,7
@@
void xbt_cond_broadcast(xbt_cond_t cond)
void xbt_cond_destroy(xbt_cond_t cond)
{
void xbt_cond_destroy(xbt_cond_t cond)
{
- SIMIX_cond_
destroy
((smx_cond_t) cond);
+ SIMIX_cond_
unref
((smx_cond_t) cond);
}
/***** barrier related functions *****/
}
/***** barrier related functions *****/
@@
-101,7
+91,6
@@
xbt_bar_t xbt_barrier_init(unsigned int count)
return bar;
}
return bar;
}
-
int xbt_barrier_wait(xbt_bar_t bar)
{
int ret=0;
int xbt_barrier_wait(xbt_bar_t bar)
{
int ret=0;
@@
-115,7
+104,6
@@
int xbt_barrier_wait(xbt_bar_t bar)
xbt_cond_wait(bar->cond, bar->mutex);
xbt_mutex_release(bar->mutex);
}
xbt_cond_wait(bar->cond, bar->mutex);
xbt_mutex_release(bar->mutex);
}
-
return ret;
}
return ret;
}
@@
-125,4
+113,3
@@
void xbt_barrier_destroy(xbt_bar_t bar)
xbt_cond_destroy(bar->cond);
xbt_free(bar);
}
xbt_cond_destroy(bar->cond);
xbt_free(bar);
}
-