more dupplicated code ritual sacrifice and cleanups

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

diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/smpi_bench.cpp
index adbbd3d..2b0a99e 100644 (file)
--- a/src/smpi/smpi_bench.cpp
+++ b/src/smpi/smpi_bench.cpp
@@ -80,7 +80,7 @@ xbt_dict_t samples = nullptr;         /* Allocated on first use */
 xbt_dict_t calls = nullptr;           /* Allocated on first use */
 
 double smpi_cpu_threshold;
-double smpi_running_power;
+double smpi_host_speed;
 
 int smpi_loaded_page = -1;
 char* smpi_start_data_exe = nullptr;
@@ -186,7 +186,7 @@ static void* shm_map(int fd, size_t size, shared_data_key_type* data) {
 }
 #endif
 
-void smpi_bench_destroy(void)
+void smpi_bench_destroy()
 {
   allocs.clear();
   allocs_metadata.clear();
@@ -207,9 +207,9 @@ void smpi_execute_(double *duration)
 }
 
 void smpi_execute_flops(double flops) {
-  smx_synchro_t action;
+  smx_activity_t action;
   XBT_DEBUG("Handle real computation time: %f flops", flops);
-  action = simcall_execution_start("computation", flops, 1, 0, 0);
+  action = simcall_execution_start("computation", flops, 1, 0);
   simcall_set_category (action, TRACE_internal_smpi_get_category());
   simcall_execution_wait(action);
   smpi_switch_data_segment(smpi_process_index());
@@ -219,7 +219,7 @@ void smpi_execute(double duration)
 {
   if (duration >= smpi_cpu_threshold) {
     XBT_DEBUG("Sleep for %g to handle real computation time", duration);
-    double flops = duration * smpi_running_power;
+    double flops = duration * smpi_host_speed;
     int rank = smpi_process_index();
     instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
     extra->type=TRACING_COMPUTING;
@@ -235,7 +235,7 @@ void smpi_execute(double duration)
   }
 }
 
-void smpi_bench_begin(void)
+void smpi_bench_begin()
 {
   if (smpi_privatize_global_variables) {
     smpi_switch_data_segment(smpi_process_index());
@@ -260,7 +260,7 @@ void smpi_bench_begin(void)
   xbt_os_threadtimer_start(smpi_process_timer());
 }
 
-void smpi_bench_end(void)
+void smpi_bench_end()
 {
   if (MC_is_active() || MC_record_replay_is_active())
     return;
@@ -403,7 +403,7 @@ int smpi_clock_gettime(clockid_t clk_id, struct timespec *tp)
 #endif
 
 extern double sg_surf_precision;
-unsigned long long smpi_rastro_resolution (void)
+unsigned long long smpi_rastro_resolution ()
 {
   smpi_bench_end();
   double resolution = (1/sg_surf_precision);
@@ -411,7 +411,7 @@ unsigned long long smpi_rastro_resolution (void)
   return static_cast<unsigned long long>(resolution);
 }
 
-unsigned long long smpi_rastro_timestamp (void)
+unsigned long long smpi_rastro_timestamp ()
 {
   smpi_bench_end();
   double now = SIMIX_get_clock();