Define __cplusplus for doxygen.

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

diff --git a/src/msg/msg_synchro.cpp b/src/msg/msg_synchro.cpp
index a1e4886..bce88e5 100644 (file)
--- a/src/msg/msg_synchro.cpp
+++ b/src/msg/msg_synchro.cpp
@@ -19,7 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (sync
 
 /** @brief creates a semaphore object of the given initial capacity */
 msg_sem_t MSG_sem_init(int initial_value) {
-  return simgrid::simix::kernelImmediate([initial_value] { return SIMIX_sem_init(initial_value); });
+  return simgrid::simix::simcall([initial_value] { return SIMIX_sem_init(initial_value); });
 }
 
 /** @brief locks on a semaphore object */
@@ -29,24 +29,16 @@ void MSG_sem_acquire(msg_sem_t 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) {
-  msg_error_t res = MSG_OK;
-  try {
-    simcall_sem_acquire_timeout(sem,timeout);
-  } catch(xbt_ex& e) {
-    if (e.category == timeout_error)
-      return MSG_TIMEOUT;
-    throw;
-  }
-  return res;
+  return simcall_sem_acquire_timeout(sem, timeout) ? MSG_TIMEOUT : MSG_OK;
 }
 
 /** @brief releases the semaphore object */
 void MSG_sem_release(msg_sem_t sem) {
-  simgrid::simix::kernelImmediate([sem] { SIMIX_sem_release(sem); });
+  simgrid::simix::simcall([sem] { SIMIX_sem_release(sem); });
 }
 
 int MSG_sem_get_capacity(msg_sem_t sem) {
-  return simgrid::simix::kernelImmediate([sem] { return SIMIX_sem_get_capacity(sem); });
+  return simgrid::simix::simcall([sem] { return SIMIX_sem_get_capacity(sem); });
 }
 
 void MSG_sem_destroy(msg_sem_t sem) {
@@ -59,7 +51,7 @@ void MSG_sem_destroy(msg_sem_t sem) {
  * But that's a classical semaphore issue, and SimGrid's semaphore are not different to usual ones here.
  */
 int MSG_sem_would_block(msg_sem_t sem) {
-  return simgrid::simix::kernelImmediate([sem] { return SIMIX_sem_would_block(sem); });
+  return simgrid::simix::simcall([sem] { return SIMIX_sem_would_block(sem); });
 }
 
 /*-**** barrier related functions ****-*/