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

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

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index a31b752..3e10693 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -296,35 +296,6 @@ void smpi_empty_status(MPI_Status * status)
   }
 }
 
-void smpi_action_trace_run(char *path)
-{
-  char *name;
-  xbt_dynar_t todo;
-  xbt_dict_cursor_t cursor;
-
-  action_fp=NULL;
-  if (path) {
-    action_fp = fopen(path, "r");
-    if (action_fp == NULL)
-      xbt_die("Cannot open %s: %s", path, strerror(errno));
-  }
-
-  if (!xbt_dict_is_empty(action_queues)) {
-    XBT_WARN
-      ("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file.");
-
-
-    xbt_dict_foreach(action_queues, cursor, name, todo) {
-      XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name);
-    }
-  }
-
-  if (path)
-    fclose(action_fp);
-  xbt_dict_free(&action_queues);
-  action_queues = xbt_dict_new_homogeneous(NULL);
-}
-
 static void smpi_mpi_request_free_voidp(void* request)
 {
   MPI_Request req = request;
@@ -370,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);
@@ -415,14 +392,15 @@ void smpi_mpi_start(MPI_Request request)
     request->real_size=request->size;
     smpi_datatype_use(request->old_type);
     smpi_comm_use(request->comm);
-    request->action = simcall_comm_irecv(mailbox, request->buf,
+    request->action = simcall_comm_irecv(SIMIX_process_self(), mailbox, request->buf,
                                          &request->real_size, &match_recv,
                                          !smpi_process_get_replaying()? &smpi_comm_copy_buffer_callback
                                          : &smpi_comm_null_copy_buffer_callback,
                                          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 {
 
 
@@ -445,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);
@@ -518,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);
   }
 
 }