Merge pull request #17 from mpoquet/master

[simgrid.git] / src / simix / smx_synchro.c

diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c
index 3937fd0..8b05de1 100644 (file)
--- a/src/simix/smx_synchro.c
+++ b/src/simix/smx_synchro.c
@@ -28,8 +28,7 @@ static smx_synchro_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
   sync = xbt_mallocator_get(simix_global->synchro_mallocator);
   sync->type = SIMIX_SYNC_SYNCHRO;
   sync->name = xbt_strdup("synchro");
-  sync->synchro.sleep = 
-    surf_workstation_sleep(smx_host, timeout);
+  sync->synchro.sleep = surf_host_sleep(smx_host, timeout);
 
   surf_action_set_data(sync->synchro.sleep, sync);
   XBT_OUT();
@@ -168,6 +167,9 @@ void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
   XBT_OUT();
 }
 
+int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex){
+  return SIMIX_mutex_trylock(mutex, simcall->issuer);
+}
 /**
  * \brief Tries to lock a mutex.
  *
@@ -228,9 +230,6 @@ void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer)
   XBT_OUT();
 }
 
-void simcall_HANDLER_mutex_destroy(smx_simcall_t simcall, smx_mutex_t mutex){
-  SIMIX_mutex_destroy(mutex);
-}
 /**
  * \brief Destroys a mutex.
  *
@@ -249,9 +248,6 @@ void SIMIX_mutex_destroy(smx_mutex_t mutex)
 
 /********************************* Condition **********************************/
 
-smx_cond_t simcall_HANDLER_cond_init(smx_simcall_t simcall){
-  return SIMIX_cond_init();
-}
 /**
  * \brief Initialize a condition.
  *
@@ -320,9 +316,6 @@ static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
   XBT_OUT();
 }
 
-void simcall_HANDLER_cond_signal(smx_simcall_t simcall, smx_cond_t cond){
-  SIMIX_cond_signal(cond);
-}
 /**
  * \brief Signalizes a condition.
  *
@@ -360,9 +353,6 @@ void SIMIX_cond_signal(smx_cond_t cond)
   XBT_OUT();
 }
 
-void simcall_HANDLER_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond){
-  SIMIX_cond_broadcast(cond);
-}
 /**
  * \brief Broadcasts a condition.
  *
@@ -382,11 +372,8 @@ void SIMIX_cond_broadcast(smx_cond_t cond)
   XBT_OUT();
 }
 
-void simcall_HANDLER_cond_destroy(smx_simcall_t simcall, smx_cond_t cond){
-  SIMIX_cond_destroy(cond);
-}
 /**
- * \brief Destroys a contidion.
+ * \brief Destroys a condition.
  *
  * Destroys and frees the condition's memory. 
  * \param cond A condition
@@ -408,9 +395,6 @@ void SIMIX_cond_destroy(smx_cond_t cond)
 
 /******************************** Semaphores **********************************/
 #define SMX_SEM_NOLIMIT 99999
-smx_sem_t simcall_HANDLER_sem_init(smx_simcall_t simcall, unsigned int value){
-  return SIMIX_sem_init(value);
-}
 /** @brief Initialize a semaphore */
 smx_sem_t SIMIX_sem_init(unsigned int value)
 {
@@ -424,9 +408,6 @@ smx_sem_t SIMIX_sem_init(unsigned int value)
   return sem;
 }
 
-void simcall_HANDLER_sem_destroy(smx_simcall_t simcall, smx_sem_t sem){
-  SIMIX_sem_destroy(sem);
-}
 /** @brief Destroys a semaphore */
 void SIMIX_sem_destroy(smx_sem_t sem)
 {