X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab7832b0c07c62e8337dde2b452ab79f94ecf63f..bdaf16e4bbff9c60cd8da2800fcad02e4a74daa4:/examples/msg/actions/actions.c

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index 0edf514bab..d8439fb34d 100644
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -112,7 +112,7 @@ static void action_recv(xbt_dynar_t action)
   DEBUG1("Receiving: %s", name);
   MSG_task_receive(&task, mailbox_name);
   //  MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
-  DEBUG2("%s %f", name, MSG_get_clock() - clock);
+  VERB2("%s %f", name, MSG_get_clock() - clock);
   MSG_task_destroy(task);
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
@@ -182,28 +182,41 @@ static void action_wait(xbt_dynar_t action)
 }
 
 /* FIXME: that's a poor man's implementation: we should take the message exchanges into account */
-smx_sem_t barrier_semaphore = NULL;
 static void barrier(xbt_dynar_t action)
 {
   char *name = NULL;
+  static smx_mutex_t mutex = NULL;
+  static smx_cond_t cond = NULL;
+  static int processes_arrived_sofar=0;
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join(action, " ");
 
-  DEBUG1("Entering barrier: %s", name);
-  if (barrier_semaphore == NULL)        // first arriving on the barrier
-    barrier_semaphore = SIMIX_sem_init(0);
+  if (mutex == NULL) {       // first arriving on the barrier
+    mutex = SIMIX_mutex_init();
+    cond = SIMIX_cond_init();
+    processes_arrived_sofar=0;
+  }
+  DEBUG2("Entering barrier: %s (%d already there)", name,processes_arrived_sofar);
 
-  if (SIMIX_sem_get_capacity(barrier_semaphore) == -communicator_size + 1) {    // last arriving
-    SIMIX_sem_release_forever(barrier_semaphore);
-    SIMIX_sem_destroy(barrier_semaphore);
-    barrier_semaphore = NULL;
-  } else {                      // not last
-    SIMIX_sem_acquire(barrier_semaphore);
+  SIMIX_mutex_lock(mutex);
+  if (++processes_arrived_sofar == communicator_size) {
+    SIMIX_cond_broadcast(cond);
+    SIMIX_mutex_unlock(mutex);
+  } else {
+    SIMIX_cond_wait(cond,mutex);
+    SIMIX_mutex_unlock(mutex);
   }
 
   DEBUG1("Exiting barrier: %s", name);
 
+  processes_arrived_sofar--;
+  if (!processes_arrived_sofar) {
+    SIMIX_cond_destroy(cond);
+    SIMIX_mutex_destroy(mutex);
+    mutex=NULL;
+  }
+
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 
@@ -469,8 +482,16 @@ static void allReduce(xbt_dynar_t action)
 
 static void comm_size(xbt_dynar_t action)
 {
+  char *name = NULL;
   char *size = xbt_dynar_get_as(action, 2, char *);
+  double clock = MSG_get_clock();
+
+  if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
+    name = xbt_str_join(action, " ");
   communicator_size = parse_double(size);
+  VERB2("%s %f", name, MSG_get_clock() - clock);
+  if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
+    free(name);
 }
 
 static void compute(xbt_dynar_t action)