X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0090ea7fd5569795fcbbc08b481d593a9355cd4a..10ceac5fd14fb0426b5c93bda85676a79b02d0be:/src/smpi/smpi_bench.cpp diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/smpi_bench.cpp index adbbd3d441..a536790ea4 100644 --- a/src/smpi/smpi_bench.cpp +++ b/src/smpi/smpi_bench.cpp @@ -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()); @@ -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(resolution); } -unsigned long long smpi_rastro_timestamp (void) +unsigned long long smpi_rastro_timestamp () { smpi_bench_end(); double now = SIMIX_get_clock();