Same thing. But working, this time.

[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 db8e2ac..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 */
 
-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_ {
@@ -45,7 +44,7 @@ void xbt_mutex_release(xbt_mutex_t mutex)
 
 void xbt_mutex_destroy(xbt_mutex_t mutex)
 {
-  simcall_mutex_destroy((smx_mutex_t) mutex);
+  SIMIX_mutex_destroy((smx_mutex_t) mutex);
 }
 
 /***** condition related functions *****/
@@ -80,7 +79,7 @@ void xbt_cond_broadcast(xbt_cond_t cond)
 
 void xbt_cond_destroy(xbt_cond_t cond)
 {
-  simcall_cond_destroy((smx_cond_t) cond);
+  SIMIX_cond_destroy((smx_cond_t) cond);
 }
 
 /***** barrier related functions *****/
@@ -101,7 +100,6 @@ xbt_bar_t xbt_barrier_init(unsigned int count)
   return bar;
 }
 
-
 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);
    }
-
    return ret;
 }
 
@@ -125,4 +122,3 @@ void xbt_barrier_destroy(xbt_bar_t bar)
    xbt_cond_destroy(bar->cond);
    xbt_free(bar);
 }
-