SMPI: info message when the collective algorithm is changed

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 16899d1..585847b 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -27,6 +27,7 @@ typedef struct s_smpi_process_data {
   char ***argv;
   smx_rdv_t mailbox;
   smx_rdv_t mailbox_small;
+  xbt_mutex_t mailboxes_mutex;
   xbt_os_timer_t timer;
   MPI_Comm comm_self;
   MPI_Comm comm_intra;
@@ -107,7 +108,6 @@ void smpi_process_init(int *argc, char ***argv)
     data->argv = argv;
     // set the process attached to the mailbox
     simcall_rdv_set_receiver(data->mailbox_small, proc);
-
     XBT_DEBUG("<%d> New process in the game: %p", index, proc);
 
     if(smpi_privatize_global_variables){
@@ -136,7 +136,7 @@ void smpi_process_finalize(void)
 {
     // This leads to an explosion of the search graph
     // which cannot be reduced:
-    if(MC_is_active())
+    if(MC_is_active() || MC_record_replay_is_active())
       return;
 
     int index = smpi_process_index();
@@ -255,6 +255,12 @@ smx_rdv_t smpi_process_mailbox_small(void)
   return data->mailbox_small;
 }
 
+xbt_mutex_t smpi_process_mailboxes_mutex(void)
+{
+  smpi_process_data_t data = smpi_process_data();
+  return data->mailboxes_mutex;
+}
+
 smx_rdv_t smpi_process_remote_mailbox(int index)
 {
   smpi_process_data_t data = smpi_process_remote_data(index);
@@ -268,6 +274,12 @@ smx_rdv_t smpi_process_remote_mailbox_small(int index)
   return data->mailbox_small;
 }
 
+xbt_mutex_t smpi_process_remote_mailboxes_mutex(int index)
+{
+  smpi_process_data_t data = smpi_process_remote_data(index);
+  return data->mailboxes_mutex;
+}
+
 xbt_os_timer_t smpi_process_timer(void)
 {
   smpi_process_data_t data = smpi_process_data();
@@ -422,6 +434,7 @@ void smpi_global_init(void)
     process_data[i]->mailbox = simcall_rdv_create(get_mailbox_name(name, i));
     process_data[i]->mailbox_small =
         simcall_rdv_create(get_mailbox_name_small(name, i));
+    process_data[i]->mailboxes_mutex=xbt_mutex_init();
     process_data[i]->timer = xbt_os_timer_new();
     if (MC_is_active())
       MC_ignore_heap(process_data[i]->timer, xbt_os_timer_size());
@@ -475,6 +488,7 @@ void smpi_global_destroy(void)
     xbt_os_timer_free(process_data[i]->timer);
     simcall_rdv_destroy(process_data[i]->mailbox);
     simcall_rdv_destroy(process_data[i]->mailbox_small);
+    xbt_mutex_destroy(process_data[i]->mailboxes_mutex);
     xbt_free(process_data[i]);
   }
   xbt_free(process_data);
@@ -536,51 +550,51 @@ static void smpi_init_logs(){
 
 static void smpi_init_options(){
   int gather_id = find_coll_description(mpi_coll_gather_description,
-                                          sg_cfg_get_string("smpi/gather"));
+                                          sg_cfg_get_string("smpi/gather"),"gather");
     mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype,
                                    void *, int, MPI_Datatype, int, MPI_Comm))
         mpi_coll_gather_description[gather_id].coll;
 
     int allgather_id = find_coll_description(mpi_coll_allgather_description,
-                                             sg_cfg_get_string("smpi/allgather"));
+                                             sg_cfg_get_string("smpi/allgather"),"allgather");
     mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype,
                                       void *, int, MPI_Datatype, MPI_Comm))
         mpi_coll_allgather_description[allgather_id].coll;
 
     int allgatherv_id = find_coll_description(mpi_coll_allgatherv_description,
-                                              sg_cfg_get_string("smpi/allgatherv"));
+                                              sg_cfg_get_string("smpi/allgatherv"),"allgatherv");
     mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, void *, int *,
                                        int *, MPI_Datatype, MPI_Comm))
         mpi_coll_allgatherv_description[allgatherv_id].coll;
 
     int allreduce_id = find_coll_description(mpi_coll_allreduce_description,
-                                             sg_cfg_get_string("smpi/allreduce"));
+                                             sg_cfg_get_string("smpi/allreduce"),"allreduce");
     mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount,
                                       MPI_Datatype dtype, MPI_Op op,
                                       MPI_Comm comm))
         mpi_coll_allreduce_description[allreduce_id].coll;
 
     int alltoall_id = find_coll_description(mpi_coll_alltoall_description,
-                                            sg_cfg_get_string("smpi/alltoall"));
+                                            sg_cfg_get_string("smpi/alltoall"),"alltoall");
     mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype,
                                      void *, int, MPI_Datatype, MPI_Comm))
         mpi_coll_alltoall_description[alltoall_id].coll;
 
     int alltoallv_id = find_coll_description(mpi_coll_alltoallv_description,
-                                             sg_cfg_get_string("smpi/alltoallv"));
+                                             sg_cfg_get_string("smpi/alltoallv"),"alltoallv");
     mpi_coll_alltoallv_fun = (int (*)(void *, int *, int *, MPI_Datatype,
                                       void *, int *, int *, MPI_Datatype,
                                       MPI_Comm))
         mpi_coll_alltoallv_description[alltoallv_id].coll;
 
     int bcast_id = find_coll_description(mpi_coll_bcast_description,
-                                         sg_cfg_get_string("smpi/bcast"));
+                                         sg_cfg_get_string("smpi/bcast"),"bcast");
     mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype,
                                   int root, MPI_Comm com))
         mpi_coll_bcast_description[bcast_id].coll;
 
     int reduce_id = find_coll_description(mpi_coll_reduce_description,
-                                          sg_cfg_get_string("smpi/reduce"));
+                                          sg_cfg_get_string("smpi/reduce"),"reduce");
     mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count,
                                    MPI_Datatype datatype, MPI_Op op,
                                    int root, MPI_Comm comm))
@@ -588,14 +602,14 @@ static void smpi_init_options(){
 
     int reduce_scatter_id =
         find_coll_description(mpi_coll_reduce_scatter_description,
-                              sg_cfg_get_string("smpi/reduce_scatter"));
+                              sg_cfg_get_string("smpi/reduce_scatter"),"reduce_scatter");
     mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts,
                                            MPI_Datatype dtype, MPI_Op op,
                                            MPI_Comm comm))
         mpi_coll_reduce_scatter_description[reduce_scatter_id].coll;
 
     int scatter_id = find_coll_description(mpi_coll_scatter_description,
-                                           sg_cfg_get_string("smpi/scatter"));
+                                           sg_cfg_get_string("smpi/scatter"),"scatter");
     mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount,
                                     MPI_Datatype sendtype, void *recvbuf,
                                     int recvcount, MPI_Datatype recvtype,
@@ -603,7 +617,7 @@ static void smpi_init_options(){
         mpi_coll_scatter_description[scatter_id].coll;
 
     int barrier_id = find_coll_description(mpi_coll_barrier_description,
-                                           sg_cfg_get_string("smpi/barrier"));
+                                           sg_cfg_get_string("smpi/barrier"),"barrier");
     mpi_coll_barrier_fun = (int (*)(MPI_Comm comm))
         mpi_coll_barrier_description[barrier_id].coll;