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
attempt to please jenkins
[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
..
5ece743
100644
(file)
--- a/
src/xbt/xbt_os_synchro.c
+++ b/
src/xbt/xbt_os_synchro.c
@@
-15,8
+15,7
@@
#include "simgrid/simix.h" /* used implementation */
#include "../simix/smx_private.h" /* FIXME */
#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 ******/
struct s_xbt_mutex_ {
/****** mutex related functions ******/
struct s_xbt_mutex_ {
@@
-101,7
+100,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
+113,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
+122,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);
}
-