A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added reference link to comment in MakeLib.cmake
[simgrid.git]
/
src
/
simix
/
smx_synchro.c
diff --git
a/src/simix/smx_synchro.c
b/src/simix/smx_synchro.c
index
3937fd0
..
3f25efe
100644
(file)
--- a/
src/simix/smx_synchro.c
+++ b/
src/simix/smx_synchro.c
@@
-168,6
+168,9
@@
void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex)
XBT_OUT();
}
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.
*
/**
* \brief Tries to lock a mutex.
*
@@
-228,9
+231,6
@@
void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer)
XBT_OUT();
}
XBT_OUT();
}
-void simcall_HANDLER_mutex_destroy(smx_simcall_t simcall, smx_mutex_t mutex){
- SIMIX_mutex_destroy(mutex);
-}
/**
* \brief Destroys a mutex.
*
/**
* \brief Destroys a mutex.
*
@@
-249,9
+249,6
@@
void SIMIX_mutex_destroy(smx_mutex_t mutex)
/********************************* Condition **********************************/
/********************************* Condition **********************************/
-smx_cond_t simcall_HANDLER_cond_init(smx_simcall_t simcall){
- return SIMIX_cond_init();
-}
/**
* \brief Initialize a condition.
*
/**
* \brief Initialize a condition.
*
@@
-320,9
+317,6
@@
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
XBT_OUT();
}
XBT_OUT();
}
-void simcall_HANDLER_cond_signal(smx_simcall_t simcall, smx_cond_t cond){
- SIMIX_cond_signal(cond);
-}
/**
* \brief Signalizes a condition.
*
/**
* \brief Signalizes a condition.
*
@@
-360,9
+354,6
@@
void SIMIX_cond_signal(smx_cond_t cond)
XBT_OUT();
}
XBT_OUT();
}
-void simcall_HANDLER_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond){
- SIMIX_cond_broadcast(cond);
-}
/**
* \brief Broadcasts a condition.
*
/**
* \brief Broadcasts a condition.
*
@@
-382,11
+373,8
@@
void SIMIX_cond_broadcast(smx_cond_t cond)
XBT_OUT();
}
XBT_OUT();
}
-void simcall_HANDLER_cond_destroy(smx_simcall_t simcall, smx_cond_t cond){
- SIMIX_cond_destroy(cond);
-}
/**
/**
- * \brief Destroys a con
tid
ion.
+ * \brief Destroys a con
dit
ion.
*
* Destroys and frees the condition's memory.
* \param cond A condition
*
* Destroys and frees the condition's memory.
* \param cond A condition
@@
-408,9
+396,6
@@
void SIMIX_cond_destroy(smx_cond_t cond)
/******************************** Semaphores **********************************/
#define SMX_SEM_NOLIMIT 99999
/******************************** 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)
{
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
{
@@
-424,9
+409,6
@@
smx_sem_t SIMIX_sem_init(unsigned int value)
return sem;
}
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)
{
/** @brief Destroys a semaphore */
void SIMIX_sem_destroy(smx_sem_t sem)
{