use global variables to store values that may be used millions of times..

diff --git a/src/include/smpi/smpi_interface.h b/src/include/smpi/smpi_interface.h
index d3cab53..41f9d40 100644 (file)
--- a/src/include/smpi/smpi_interface.h
+++ b/src/include/smpi/smpi_interface.h
@@ -117,4 +117,10 @@ XBT_PUBLIC(void) coll_help(const char *category,
                            s_mpi_coll_description_t * table);
 XBT_PUBLIC(int) find_coll_description(s_mpi_coll_description_t * table,
                                       char *name);
+
+
+extern double smpi_wtime_sleep;
+extern double smpi_iprobe_sleep;
+extern double smpi_test_sleep;
+
 #endif                          /* _SMPI_INTERFAC_H */

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index b33377e..7f75a51 100644 (file)
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -342,6 +342,21 @@ static void _sg_cfg_cb__coll_scatter(const char *name, int pos){
 static void _sg_cfg_cb__coll_barrier(const char *name, int pos){
   _sg_cfg_cb__coll("barrier", mpi_coll_barrier_description, name, pos);
 }
+
+static void _sg_cfg_cb__wtime_sleep(const char *name, int pos){
+  smpi_wtime_sleep = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__iprobe_sleep(const char *name, int pos){
+  smpi_iprobe_sleep = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__test_sleep(const char *name, int pos){
+  smpi_test_sleep = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+
+
 #endif
 
 /* callback of the inclusion path */
@@ -839,18 +854,18 @@ void sg_config_init(int *argc, char **argv)
 
     xbt_cfg_register(&_sg_cfg_set, "smpi/iprobe",
                      "Minimum time to inject inside a call to MPI_Iprobe",
-                     xbt_cfgelm_double, 1, 1, NULL, NULL);
+                     xbt_cfgelm_double, 1, 1, _sg_cfg_cb__iprobe_sleep, NULL);
     xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/iprobe", 1e-4);
 
     xbt_cfg_register(&_sg_cfg_set, "smpi/test",
                      "Minimum time to inject inside a call to MPI_Test",
-                     xbt_cfgelm_double, 1, 1, NULL, NULL);
+                     xbt_cfgelm_double, 1, 1, _sg_cfg_cb__test_sleep, NULL);
     xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/test", 1e-4);
 
     xbt_cfg_register(&_sg_cfg_set, "smpi/wtime",
                      "Minimum time to inject inside a call to MPI_Wtime",
-                     xbt_cfgelm_double, 1, 1, NULL, NULL);
-    xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/wtime", 3e-8);
+                     xbt_cfgelm_double, 1, 1, _sg_cfg_cb__wtime_sleep, NULL);
+    xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/wtime", 0.0);
 
     xbt_cfg_register(&_sg_cfg_set, "smpi/coll_selector",
                      "Which collective selector to use",

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index d5b2731..15ca609 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 ?)
@@ -191,8 +196,7 @@ double smpi_wtime(){
     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();
@@ -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;