X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78d66ee7979cae24d0b789adb83a2d1cfebb7bea..e9f0018b823e34405847177b25a85d3facc30ae1:/src/smpi/smpi_base.c

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 3e10693c7d..497f383505 100644
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -7,10 +7,10 @@
 #include "private.h"
 #include "xbt/virtu.h"
 #include "mc/mc.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 #include "xbt/replay.h"
 #include <errno.h>
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "surf/surf.h"
 #include "simgrid/sg_config.h"
 #include "colls/colls.h"
@@ -342,16 +342,16 @@ void smpi_mpi_start(MPI_Request request)
   if (request->flags & RECV) {
     print_request("New recv", request);
 
-    int async_small_thres = sg_cfg_get_int("smpi/async_small_thres");
+    int async_small_thresh = sg_cfg_get_int("smpi/async_small_thresh");
 
     xbt_mutex_t mut = smpi_process_mailboxes_mutex();
-    if (async_small_thres != 0 ||request->flags & RMA)
+    if (async_small_thresh != 0 ||request->flags & RMA)
       xbt_mutex_acquire(mut);
 
-    if (async_small_thres == 0 && !request->flags & RMA) {
+    if (async_small_thresh == 0 && !(request->flags & RMA)) {
       mailbox = smpi_process_mailbox();
     }
-    else if (request->flags & RMA || request->size < async_small_thres){
+    else if (request->flags & RMA || request->size < async_small_thresh){
     //We have to check both mailboxes (because SSEND messages are sent to the large mbox). begin with the more appropriate one : the small one.
       mailbox = smpi_process_mailbox_small();
       XBT_DEBUG("Is there a corresponding send already posted in the small mailbox %p (in case of SSEND)?", mailbox);
@@ -399,7 +399,7 @@ void smpi_mpi_start(MPI_Request request)
                                          request, -1.0);
         XBT_DEBUG("recv simcall posted");
 
-    if (async_small_thres != 0 || request->flags & RMA)
+    if (async_small_thresh != 0 || request->flags & RMA)
       xbt_mutex_release(mut);
   } else {
 
@@ -424,17 +424,17 @@ void smpi_mpi_start(MPI_Request request)
         XBT_DEBUG("sending size of %zu : sleep %f ", request->size, smpi_os(request->size));
     }
 
-    int async_small_thres = sg_cfg_get_int("smpi/async_small_thres");
+    int async_small_thresh = sg_cfg_get_int("smpi/async_small_thresh");
 
     xbt_mutex_t mut=smpi_process_remote_mailboxes_mutex(receiver);
 
-    if (async_small_thres != 0 ||request->flags & RMA)
+    if (async_small_thresh != 0 || request->flags & RMA)
       xbt_mutex_acquire(mut);
 
-    if (!(async_small_thres != 0 ||request->flags & RMA)) {
+    if (!(async_small_thresh != 0 || request->flags & RMA)) {
       mailbox = smpi_process_remote_mailbox(receiver);
     }
-    else if (request->flags & RMA || request->size < async_small_thres) { // eager mode
+    else if (request->flags & RMA || request->size < async_small_thresh) { // eager mode
       mailbox = smpi_process_remote_mailbox(receiver);
       XBT_DEBUG("Is there a corresponding recv already posted in the large mailbox %p?", mailbox);
       smx_synchro_t action = simcall_comm_iprobe(mailbox, 1,request->dst, request->tag, &match_send, (void*)request);
@@ -503,7 +503,7 @@ void smpi_mpi_start(MPI_Request request)
     if (request->action)
     	simcall_set_category(request->action, TRACE_internal_smpi_get_category());
 
-    if (async_small_thres != 0 || request->flags & RMA)
+    if (async_small_thresh != 0 || request->flags & RMA)
       xbt_mutex_release(mut);
   }
 
@@ -881,7 +881,7 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status*
 
   print_request("New iprobe", request);
   // We have to test both mailboxes as we don't know if we will receive one one or another
-  if (sg_cfg_get_int("smpi/async_small_thres")>0){
+  if (sg_cfg_get_int("smpi/async_small_thresh")>0){
       mailbox = smpi_process_mailbox_small();
       XBT_DEBUG("trying to probe the perm recv mailbox");
       request->action = simcall_comm_iprobe(mailbox, 0, request->src, request->tag, &match_recv, (void*)request);
@@ -1086,14 +1086,14 @@ int smpi_mpi_testsome(int incount, MPI_Request requests[], int *indices,
 void smpi_mpi_bcast(void *buf, int count, MPI_Datatype datatype, int root,
                     MPI_Comm comm)
 {
-  // arity=2: a binary tree, arity=4 seem to be a good setting (see P2P-MPI))
-  nary_tree_bcast(buf, count, datatype, root, comm, 4);
+  // use openMPI selector as default one, as naive one was removed
+    smpi_coll_tuned_bcast_ompi(buf, count, datatype, root, comm);
 }
 
 void smpi_mpi_barrier(MPI_Comm comm)
 {
-  // arity=2: a binary tree, arity=4 seem to be a good setting (see P2P-MPI))
-  nary_tree_barrier(comm, 4);
+  // use openMPI selector as default one, as naive one was removed
+    smpi_coll_tuned_barrier_ompi(comm);
 }
 
 void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,