From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 2 Feb 2010 23:17:54 +0000 (+0000)
Subject: Make SIMIX_sem_block_onto public and fix a bug in SIMIX_sem_destroy
X-Git-Tag: SVN~685
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/73f67969a89c1c448cb17d626d448dd0346126fc

Make SIMIX_sem_block_onto public and fix a bug in SIMIX_sem_destroy

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7048 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 00da72fb97..e5c3458721 100644
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -146,6 +146,7 @@ XBT_PUBLIC(void) SIMIX_sem_destroy(smx_sem_t sem);
 XBT_PUBLIC(void) SIMIX_sem_release(smx_sem_t sem);
 XBT_PUBLIC(void) SIMIX_sem_release_forever(smx_sem_t sem);
 XBT_PUBLIC(int) SIMIX_sem_would_block(smx_sem_t sem);
+XBT_PUBLIC(void) SIMIX_sem_block_onto(smx_sem_t sem);
 XBT_PUBLIC(void) SIMIX_sem_acquire(smx_sem_t sem);
 XBT_PUBLIC(void) SIMIX_sem_acquire_timeout(smx_sem_t sem, double max_duration);
 XBT_PUBLIC(unsigned int) SIMIX_sem_acquire_any(xbt_dynar_t sems);
diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c
index 8023ddebc4..b740deaaaa 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);
@@ -407,7 +406,17 @@ void SIMIX_sem_release_forever(smx_sem_t sem) {
   }
 }
 
-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 */
@@ -455,6 +464,7 @@ 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);
 }
 /**
  * \brief Tries to acquire a semaphore before a timeout