Do connect all log channel manually to parent using XBT_LOG_CONNECT() too, so that...

[simgrid.git] / src / smpi / smpi_base.c

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 797e242..c119790 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -43,6 +43,16 @@ void smpi_mpi_init()
        int i;
        smpi_host_data_t hdata;
 
        int i;
        smpi_host_data_t hdata;
 

+   /* Connect our log channels: that must be done manually under windows */
+   /* (should be done only once, not for each process) */
+   XBT_LOG_CONNECT(smpi_base, smpi);
+   XBT_LOG_CONNECT(smpi_bench, smpi);
+   XBT_LOG_CONNECT(smpi_kernel, smpi);
+   XBT_LOG_CONNECT(smpi_mpi, smpi);
+   XBT_LOG_CONNECT(smpi_receiver, smpi);
+   XBT_LOG_CONNECT(smpi_sender, smpi);
+   XBT_LOG_CONNECT(smpi_util, smpi);
+   

        SIMIX_mutex_lock(smpi_global->running_hosts_count_mutex);
        smpi_global->running_hosts_count++;
        SIMIX_mutex_unlock(smpi_global->running_hosts_count_mutex);
        SIMIX_mutex_lock(smpi_global->running_hosts_count_mutex);
        smpi_global->running_hosts_count++;
        SIMIX_mutex_unlock(smpi_global->running_hosts_count_mutex);


@@ -176,7 +186,10 @@ int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
 {
 
        SIMIX_mutex_lock(comm->barrier_mutex);
 {
 
        SIMIX_mutex_lock(comm->barrier_mutex);

-       if (++comm->barrier_count >= comm->size) {
+       ++comm->barrier_count;
+       if (comm->barrier_count > comm->size) { // only happens on second barrier...
+               comm->barrier_count = 0;
+       } else if (comm->barrier_count == comm->size) {

                SIMIX_cond_broadcast(comm->barrier_cond);
        }
        while (comm->barrier_count < comm->size) {
                SIMIX_cond_broadcast(comm->barrier_cond);
        }
        while (comm->barrier_count < comm->size) {