update algo

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

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index d5b2731..52eba54 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,14 +190,13 @@ static double smpi_or(double size)
   return current;
 }
 
-double smpi_wtime(){
+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
-    double sleeptime= sg_cfg_get_double("smpi/wtime");
-    simcall_process_sleep(sleeptime);
+    if(smpi_wtime_sleep > 0) simcall_process_sleep(smpi_wtime_sleep);
     smpi_bench_begin();
   } else {
     time = SIMIX_get_clock();
@@ -397,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);
@@ -646,7 +650,7 @@ 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());
         }
       }
 
@@ -694,10 +698,9 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) {
   //assume that request is not MPI_REQUEST_NULL (filtered in PMPI_Test or smpi_mpi_testall before)
 
   //to avoid deadlocks
-  double sleeptime= sg_cfg_get_double("smpi/test");
   //multiplier to the sleeptime, to increase speed of execution, each failed test will increase it
   static int nsleeps = 1;
-  simcall_process_sleep(nsleeps*sleeptime);
+  if(smpi_test_sleep > 0)  simcall_process_sleep(nsleeps*smpi_test_sleep);
 
   smpi_empty_status(status);
   flag = 1;
@@ -737,11 +740,9 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
     }
   }
   if(size > 0) {
-    //to avoid deadlocks
-    double sleeptime= sg_cfg_get_double("smpi/test");
     //multiplier to the sleeptime, to increase speed of execution, each failed testany will increase it
     static int nsleeps = 1;
-    simcall_process_sleep(nsleeps*sleeptime);
+    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
@@ -807,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(nsleeps*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;
 
@@ -821,12 +819,12 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status*
     if (sg_cfg_get_int("smpi/async_small_thres")>0){
         mailbox = smpi_process_mailbox_small();
         XBT_DEBUG("trying to probe the perm recv mailbox");
-        request->action = simcall_comm_iprobe(mailbox, request->src, request->tag, &match_recv, (void*)request);
+        request->action = simcall_comm_iprobe(mailbox, 0, request->src, request->tag, &match_recv, (void*)request);
     }
     if (request->action==NULL){
        mailbox = smpi_process_mailbox();
         XBT_DEBUG("trying to probe the other mailbox");
-        request->action = simcall_comm_iprobe(mailbox, request->src, request->tag, &match_recv, (void*)request);
+        request->action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request);
     }
 
   if(request->action){