Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/msg/msg_synchro.cpp b/src/msg/msg_synchro.cpp
index 70f1383..d88e01f 100644 (file)
--- a/src/msg/msg_synchro.cpp
+++ b/src/msg/msg_synchro.cpp
@@ -9,17 +9,13 @@
 #include "xbt/synchro_core.h"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg,
-                                "Logging specific to MSG (synchro)");
-
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
 
 /** @addtogroup msg_synchro
  *
  *  @{
  */
 
-/********************************* Host **************************************/
-
 /** @brief creates a semaphore object of the given initial capacity */
 msg_sem_t MSG_sem_init(int initial_value) {
   return simcall_sem_init(initial_value);
@@ -29,6 +25,7 @@ msg_sem_t MSG_sem_init(int initial_value) {
 void MSG_sem_acquire(msg_sem_t sem) {
   simcall_sem_acquire(sem);
 }
+
 /** @brief locks on a semaphore object up until the provided timeout expires */
 msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout) {
   xbt_ex_t e;
@@ -45,17 +42,20 @@ msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout) {
   }
   return res;
 }
+
 /** @brief releases the semaphore object */
 void MSG_sem_release(msg_sem_t sem) {
   simcall_sem_release(sem);
 }
+
 void MSG_sem_get_capacity(msg_sem_t sem) {
   simcall_sem_get_capacity(sem);
 }
 
 void MSG_sem_destroy(msg_sem_t sem) {
-  simcall_sem_destroy(sem);
+  SIMIX_sem_destroy(sem);
 }
+
 /** @brief returns a boolean indicating if this semaphore would block at this very specific time
  *
  * Note that the returned value may be wrong right after the function call, when you try to use it...
@@ -82,5 +82,4 @@ int MSG_barrier_wait(msg_bar_t bar) {
   else
     return 0;
 }
-
 /**@}*/