Tentatively use sampling with Fortran.

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

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index ed6e7c0..e5e18b1 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -47,7 +47,7 @@ static void smpi_execute_flops(double flops)
   smx_host_t host;
   host = SIMIX_host_self();
 
-  DEBUG1("Handle real computation time: %f flops", flops);
+  XBT_DEBUG("Handle real computation time: %f flops", flops);
   action = SIMIX_req_host_execute("computation", host, flops, 1);
 #ifdef HAVE_TRACING
   SIMIX_req_set_category (action, TRACE_internal_smpi_get_category());
@@ -58,7 +58,7 @@ static void smpi_execute_flops(double flops)
 static void smpi_execute(double duration)
 {
   if (duration >= xbt_cfg_get_double(_surf_cfg_set, "smpi/cpu_threshold")) {
-    DEBUG1("Sleep for %f to handle real computation time", duration);
+    XBT_DEBUG("Sleep for %f to handle real computation time", duration);
     smpi_execute_flops(duration *
                        xbt_cfg_get_double(_surf_cfg_set,
                                           "smpi/running_power"));
@@ -104,7 +104,7 @@ static char *sample_location(int global, const char *file, int line)
   }
 }
 
-void smpi_sample_1(int global, const char *file, int line, int iters, double threshold)
+int smpi_sample_1(int global, const char *file, int line, int iters, double threshold)
 {
   char *loc = sample_location(global, file, line);
   local_data_t *data;
@@ -123,8 +123,10 @@ void smpi_sample_1(int global, const char *file, int line, int iters, double thr
     data->threshold = threshold;
     data->started = 0;
     xbt_dict_set(samples, loc, data, &free);
+    return 0;
   }
   free(loc);
+  return 1;
 }
 
 int smpi_sample_2(int global, const char *file, int line)
@@ -140,7 +142,7 @@ int smpi_sample_2(int global, const char *file, int line)
   if (!data->started) {
     if ((data->iters > 0 && data->count >= data->iters)
         || (data->count > 1 && data->threshold > 0.0 && data->relstderr <= data->threshold)) {
-      DEBUG1("Perform some wait of %f", data->mean);
+      XBT_DEBUG("Perform some wait of %f", data->mean);
       smpi_execute(data->mean);
     } else {
       data->started = 1;
@@ -163,18 +165,18 @@ void smpi_sample_3(int global, const char *file, int line)
 
   xbt_assert0(samples, "You did something very inconsistent, didn't you?");
   data = xbt_dict_get_or_null(samples, loc);
-  if (!data || !data->started || data->count >= data->iters) {
-    xbt_assert0(data, "Please, do thing in order");
-  }
   smpi_bench_end();
-  sample = smpi_process_simulated_elapsed();
-  data->sum += sample;
-  data->sum_pow2 += sample * sample;
-  n = (double)data->count;
-  data->mean = data->sum / n;
-  data->relstderr = sqrt((data->sum_pow2 / n - data->mean * data->mean) / n) / data->mean;
-  DEBUG4("Average mean after %d steps is %f, relative standard error is %f (sample was %f)", data->count,
-         data->mean, data->relstderr, sample);
+  if(data && data->started && data->count < data->iters) {
+    sample = smpi_process_simulated_elapsed();
+    data->sum += sample;
+    data->sum_pow2 += sample * sample;
+    n = (double)data->count;
+    data->mean = data->sum / n;
+    data->relstderr = sqrt((data->sum_pow2 / n - data->mean * data->mean) / n) / data->mean;
+    XBT_DEBUG("Average mean after %d steps is %f, relative standard error is %f (sample was %f)", data->count,
+           data->mean, data->relstderr, sample);
+  }
+  free(loc);
 }
 
 void smpi_sample_flops(double flops)
@@ -208,12 +210,12 @@ void smpi_shared_free(void *ptr)
   char *loc;
 
   if (!allocs) {
-    WARN0("Cannot free: nothing was allocated");
+    XBT_WARN("Cannot free: nothing was allocated");
     return;
   }
   loc = xbt_dict_get_key(allocs, data);
   if (!loc) {
-    WARN1("Cannot free: %p was not shared-allocated by SMPI", ptr);
+    XBT_WARN("Cannot free: %p was not shared-allocated by SMPI", ptr);
     return;
   }
   data->count--;