X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b757886241c3fc8c055842b3cf7fef7494031d7..ba58c8b937ee08fc2b46be62a50b0b3ff0b0104f:/src/simix/smx_synchro.c

diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c
index 8023ddebc4..7a27b495a1 100644
--- a/src/simix/smx_synchro.c
+++ b/src/simix/smx_synchro.c
@@ -355,7 +355,6 @@ void SIMIX_sem_destroy(smx_sem_t sem) {
   if (sem == NULL)
     return;
 
-  xbt_fifo_item_t item = NULL;
   smx_action_t action = NULL;
 
   xbt_assert0(xbt_swag_size(sem->sleeping) == 0,
@@ -363,9 +362,8 @@ void SIMIX_sem_destroy(smx_sem_t sem) {
   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);
@@ -377,6 +375,7 @@ void SIMIX_sem_destroy(smx_sem_t 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);
@@ -405,9 +404,20 @@ void SIMIX_sem_release_forever(smx_sem_t sem) {
     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 */
@@ -424,6 +434,14 @@ 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
  *
@@ -446,6 +464,7 @@ void SIMIX_sem_acquire(smx_sem_t sem) {
     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));
@@ -455,6 +474,8 @@ void SIMIX_sem_acquire(smx_sem_t 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
@@ -476,6 +497,7 @@ void SIMIX_sem_acquire_timeout(smx_sem_t sem, double max_duration) {
   }
 
   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);
@@ -489,6 +511,7 @@ void SIMIX_sem_acquire_timeout(smx_sem_t sem, double max_duration) {
     } else {
       SIMIX_action_destroy(act_sleep);
     }
+    sem->capacity++;
 
   } else
     SIMIX_sem_acquire(sem);