Merge master into mc-process

[simgrid.git] / src / msg / msg_synchro.c

diff --git a/src/msg/msg_synchro.c b/src/msg/msg_synchro.c
index 186fcefccf7fbcc2af552cf2d56b82d546857cdb..70f13837fc9985a81c224bad991dd7476c0f852f 100644 (file)
--- a/src/msg/msg_synchro.c
+++ b/src/msg/msg_synchro.c
@@ -76,8 +76,11 @@ void MSG_barrier_destroy(msg_bar_t bar) {
 }
 
 /** @brief Performs a barrier already initialized */
-void MSG_barrier_wait(msg_bar_t bar) {
-  xbt_barrier_wait((xbt_bar_t)bar);
+int MSG_barrier_wait(msg_bar_t bar) {
+  if(xbt_barrier_wait((xbt_bar_t)bar) == XBT_BARRIER_SERIAL_PROCESS)
+    return MSG_BARRIER_SERIAL_PROCESS;
+  else
+    return 0;
 }
 
 /**@}*/