[smpi] Avoid locking the mutex when it's not needed

This is more MC-friendly.

diff --git a/examples/smpi/mc/only_send_deterministic.tesh b/examples/smpi/mc/only_send_deterministic.tesh
index 6484cc9..c315df9 100644 (file)
--- a/examples/smpi/mc/only_send_deterministic.tesh
+++ b/examples/smpi/mc/only_send_deterministic.tesh
@@ -7,8 +7,8 @@ $ ../../../smpi_script/bin/smpirun -wrapper "${bindir:=.}/../../../bin/simgrid-m
 > [0.000000] [mc_global/INFO] **** Only-send-deterministic communication pattern ****
 > [0.000000] [mc_global/INFO] ******************************************************
 > [0.000000] [mc_global/INFO] The recv communications pattern of the process 0 is different! Different source for communication #2
-> [0.000000] [mc_global/INFO] Expanded states = 1025
-> [0.000000] [mc_global/INFO] Visited states = 3640
-> [0.000000] [mc_global/INFO] Executed transitions = 3360
+> [0.000000] [mc_global/INFO] Expanded states = 520
+> [0.000000] [mc_global/INFO] Visited states = 1476
+> [0.000000] [mc_global/INFO] Executed transitions = 1312
 > [0.000000] [mc_global/INFO] Send-deterministic : Yes
 > [0.000000] [mc_global/INFO] Recv-deterministic : No

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index a61c0e5..3e10693 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -341,11 +341,17 @@ void smpi_mpi_start(MPI_Request request)
 
   if (request->flags & RECV) {
     print_request("New recv", request);
-        
-    xbt_mutex_t mut=smpi_process_mailboxes_mutex();
-    xbt_mutex_acquire(mut);
-    
-    if (request->flags & RMA || request->size < sg_cfg_get_int("smpi/async_small_thres")){
+
+    int async_small_thres = sg_cfg_get_int("smpi/async_small_thres");
+
+    xbt_mutex_t mut = smpi_process_mailboxes_mutex();
+    if (async_small_thres != 0 ||request->flags & RMA)
+      xbt_mutex_acquire(mut);
+
+    if (async_small_thres == 0 && !request->flags & RMA) {
+      mailbox = smpi_process_mailbox();
+    }
+    else if (request->flags & RMA || request->size < async_small_thres){
     //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);
@@ -393,7 +399,8 @@ void smpi_mpi_start(MPI_Request request)
                                          request, -1.0);
         XBT_DEBUG("recv simcall posted");
 
-    xbt_mutex_release(mut);
+    if (async_small_thres != 0 || request->flags & RMA)
+      xbt_mutex_release(mut);
   } else {
 
 
@@ -416,11 +423,18 @@ void smpi_mpi_start(MPI_Request request)
         simcall_process_sleep(sleeptime);
         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");
+
     xbt_mutex_t mut=smpi_process_remote_mailboxes_mutex(receiver);
-    xbt_mutex_acquire(mut);
-    
-    if (request->flags & RMA || request->size < sg_cfg_get_int("smpi/async_small_thres")) { // eager mode
+
+    if (async_small_thres != 0 ||request->flags & RMA)
+      xbt_mutex_acquire(mut);
+
+    if (!(async_small_thres != 0 ||request->flags & RMA)) {
+      mailbox = smpi_process_remote_mailbox(receiver);
+    }
+    else if (request->flags & RMA || request->size < async_small_thres) { // 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);
@@ -489,7 +503,8 @@ void smpi_mpi_start(MPI_Request request)
     if (request->action)
        simcall_set_category(request->action, TRACE_internal_smpi_get_category());
 
-    xbt_mutex_release(mut);
+    if (async_small_thres != 0 || request->flags & RMA)
+      xbt_mutex_release(mut);
   }
 
 }