[smpi] Use SMPI namespace for some public variables/functions

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

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index a86a8a8..ccbd026 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -71,6 +71,11 @@ xbt_dynar_t smpi_os_values = NULL;
 xbt_dynar_t smpi_or_values = NULL;
 xbt_dynar_t smpi_ois_values = NULL;
 
+double smpi_wtime_sleep = 0.0;
+double smpi_iprobe_sleep = 1e-4;
+double smpi_test_sleep = 1e-4;
+
+
 // Methods used to parse and store the values for timing injections in smpi
 // These are taken from surf/network.c and generalized to have more factors
 // These methods should be merged with those in surf/network.c (moved somewhere in xbt ?)
@@ -185,6 +190,20 @@ static double smpi_or(double size)
   return current;
 }
 
+double smpi_mpi_wtime(){
+  double time;
+  if (smpi_process_initialized() && !smpi_process_finalized() && !smpi_process_get_sampling()) {
+    smpi_bench_end();
+    time = SIMIX_get_clock();
+    //to avoid deadlocks if called too many times
+    if(smpi_wtime_sleep > 0) simcall_process_sleep(smpi_wtime_sleep);
+    smpi_bench_begin();
+  } else {
+    time = SIMIX_get_clock();
+  }
+  return time;
+}
+
 static MPI_Request build_request(void *buf, int count,
                                  MPI_Datatype datatype, int src, int dst,
                                  int tag, MPI_Comm comm, unsigned flags)
@@ -382,7 +401,7 @@ void smpi_mpi_start(MPI_Request request)
              && ((char*)request->buf >= start_data_exe)
              && ((char*)request->buf < start_data_exe + size_data_exe )){
             XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment ");
-                   switch_data_segment(request->src);
+                   smpi_switch_data_segment(request->src);
          }
           buf = xbt_malloc(request->size);
           memcpy(buf,oldbuf,request->size);
@@ -631,21 +650,20 @@ static void finish_wait(MPI_Request * request, MPI_Status * status)
             && ((char*)req->old_buf < start_data_exe + size_data_exe )
         ){
             XBT_VERB("Privatization : We are unserializing to a zone in global memory - Switch data segment ");
-            switch_data_segment(smpi_process_index());
+            smpi_switch_data_segment(smpi_process_index());
         }
       }
-      if(req->flags & RECV) {
-
-        if(datatype->has_subtype == 1){
-          // This part handles the problem of non-contignous memory
-          // the unserialization at the reception
-          s_smpi_subtype_t *subtype = datatype->substruct;
-            subtype->unserialize(req->buf, req->old_buf, req->real_size/smpi_datatype_size(datatype) , datatype->substruct, req->op);
-          if(req->detached == 0) free(req->buf);
-        }else{//apply op on contiguous buffer for accumulate
-            int n =req->real_size/smpi_datatype_size(datatype);
-            smpi_op_apply(req->op, req->buf, req->old_buf, &n, &datatype);
-        }
+
+      if(datatype->has_subtype == 1){
+        // This part handles the problem of non-contignous memory
+        // the unserialization at the reception
+        s_smpi_subtype_t *subtype = datatype->substruct;
+        if(req->flags & RECV)
+          subtype->unserialize(req->buf, req->old_buf, req->real_size/smpi_datatype_size(datatype) , datatype->substruct, req->op);
+        if(req->detached == 0) free(req->buf);
+      }else if(req->flags & RECV){//apply op on contiguous buffer for accumulate
+          int n =req->real_size/smpi_datatype_size(datatype);
+          smpi_op_apply(req->op, req->buf, req->old_buf, &n, &datatype);
       }
     }
     smpi_comm_unuse(req->comm);
@@ -678,6 +696,12 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) {
   int flag;
 
   //assume that request is not MPI_REQUEST_NULL (filtered in PMPI_Test or smpi_mpi_testall before)
+
+  //to avoid deadlocks
+  //multiplier to the sleeptime, to increase speed of execution, each failed test will increase it
+  static int nsleeps = 1;
+  if(smpi_test_sleep > 0)  simcall_process_sleep(nsleeps*smpi_test_sleep);
+
   smpi_empty_status(status);
   flag = 1;
   if (!((*request)->flags & PREPARED)) {
@@ -685,8 +709,11 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) {
       flag = simcall_comm_test((*request)->action);
     if (flag) {
       finish_wait(request, status);
+      nsleeps=1;//reset the number of sleeps we will do next time
       if (*request != MPI_REQUEST_NULL && !((*request)->flags & PERSISTENT))
       *request = MPI_REQUEST_NULL;
+    }else{
+      nsleeps++;
     }
   }
   return flag;
@@ -713,6 +740,10 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
     }
   }
   if(size > 0) {
+    //multiplier to the sleeptime, to increase speed of execution, each failed testany will increase it
+    static int nsleeps = 1;
+    if(smpi_test_sleep > 0) simcall_process_sleep(nsleeps*smpi_test_sleep);
+
     i = simcall_comm_testany(comms);
     // not MPI_UNDEFINED, as this is a simix return code
     if(i != -1) {
@@ -721,6 +752,9 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
       if (requests[*index] != MPI_REQUEST_NULL && (requests[*index]->flags & NON_PERSISTENT))
       requests[*index] = MPI_REQUEST_NULL;
       flag = 1;
+      nsleeps=1;
+    }else{
+      nsleeps++;
     }
   }else{
       //all requests are null or inactive, return true
@@ -774,12 +808,9 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status*
             comm, PERSISTENT | RECV);
 
   //to avoid deadlock, we have to sleep some time here, or the timer won't advance and we will only do iprobe simcalls
-  double sleeptime= sg_cfg_get_double("smpi/iprobe");
   //multiplier to the sleeptime, to increase speed of execution, each failed iprobe will increase it
   static int nsleeps = 1;
-
-  simcall_process_sleep(sleeptime);
-
+  if(smpi_iprobe_sleep > 0)  simcall_process_sleep(nsleeps*smpi_iprobe_sleep);
   // behave like a receive, but don't do it
   smx_rdv_t mailbox;