* \param mutex The mutex
* \return 1 - mutex free, 0 - mutex used
*/
-int SIMIX_mutex_trylock(smx_mutex_t mutex)
+XBT_INLINE int SIMIX_mutex_trylock(smx_mutex_t mutex)
{
xbt_assert0((mutex != NULL), "Invalid parameters");
* Destroys and frees the mutex's memory.
* \param mutex A mutex
*/
-void SIMIX_mutex_destroy(smx_mutex_t mutex)
+XBT_INLINE void SIMIX_mutex_destroy(smx_mutex_t mutex)
{
if (mutex == NULL)
return;
return;
}
-xbt_fifo_t SIMIX_cond_get_actions(smx_cond_t cond)
+XBT_INLINE xbt_fifo_t SIMIX_cond_get_actions(smx_cond_t cond)
{
xbt_assert0((cond != NULL), "Invalid parameters");
return cond->actions;
if (sem == NULL)
return;
- xbt_fifo_item_t item = NULL;
smx_action_t action = NULL;
xbt_assert0(xbt_swag_size(sem->sleeping) == 0,
xbt_swag_free(sem->sleeping);
DEBUG1("%d actions registered", xbt_fifo_size(sem->actions));
- xbt_fifo_foreach(sem->actions, item, action, smx_action_t) {
+ while((action=xbt_fifo_pop(sem->actions)))
SIMIX_unregister_action_to_semaphore(action, sem);
- }
xbt_fifo_free(sem->actions);
xbt_free(sem);
* If no one was blocked, the semaphore capacity is increased by 1.
* */
void SIMIX_sem_release(smx_sem_t sem) {
+ DEBUG1("Sem release semaphore %p", sem);
if (xbt_swag_size(sem->sleeping) >= 1) {
smx_process_t proc = xbt_swag_extract(sem->sleeping);
xbt_swag_insert(proc, simix_global->process_to_run);
xbt_swag_remove(proc, sem->sleeping);
xbt_swag_insert(proc, simix_global->process_to_run);
}
+ sem->capacity = SMX_SEM_NOLIMIT;
}
-static inline void SIMIX_sem_block_onto(smx_sem_t sem) {
+/**
+ * \brief Low level wait on a semaphore
+ *
+ * This function does not test the capacity of the semaphore and direcly locks
+ * the calling process on the semaphore (until someone call SIMIX_sem_release()
+ * on this semaphore). Do not call this function if you did not attach any action
+ * to this semaphore to be awaken. Note also that you may miss host failure if you
+ * do not attach a dummy action beforehand. SIMIX_sem_acquire does all these
+ * things for you so you it may be preferable to use.
+ */
+void SIMIX_sem_block_onto(smx_sem_t sem) {
smx_process_t self = SIMIX_process_self();
/* process status */
}
/** @brief Returns true if acquiring this semaphore would block */
-int SIMIX_sem_would_block(smx_sem_t sem) {
+XBT_INLINE int SIMIX_sem_would_block(smx_sem_t sem) {
return (sem->capacity>0);
}
+/** @brief Returns the current capacity of the semaphore
+ *
+ * If it's negative, that's the amount of processes locked on the semaphore
+ */
+int SIMIX_sem_get_capacity(smx_sem_t sem){
+ return sem->capacity;
+}
+
/**
* \brief Waits on a semaphore
*
return;
}
+ sem->capacity--;
/* Always create an action null in case there is a host failure */
act_sleep = SIMIX_action_sleep(SIMIX_host_self(), -1);
SIMIX_action_set_name(act_sleep,bprintf("Locked in semaphore %p", sem));
SIMIX_process_self()->waiting_action = NULL;
SIMIX_unregister_action_to_semaphore(act_sleep, sem);
SIMIX_action_destroy(act_sleep);
+ DEBUG1("End of Wait on semaphore %p", sem);
+ sem->capacity++;
}
/**
* \brief Tries to acquire a semaphore before a timeout
}
if (max_duration >= 0) {
+ sem->capacity--;
act_sleep = SIMIX_action_sleep(SIMIX_host_self(), max_duration);
SIMIX_action_set_name(act_sleep,bprintf("Timed wait semaphore %p (max_duration:%f)", sem,max_duration));
SIMIX_register_action_to_semaphore(act_sleep, sem);
} else {
SIMIX_action_destroy(act_sleep);
}
+ sem->capacity++;
} else
SIMIX_sem_acquire(sem);
