From: Faure Adrien Date: Tue, 20 Aug 2019 19:21:32 +0000 (+0200) Subject: fix bad private function location X-Git-Tag: v3.24~151^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/484ee613a810280185412a40572bfc233c6f1553 fix bad private function location and fix bad reference to spmi_execute_benched --- diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index f892ae76a8..c4e27b890a 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -979,7 +979,6 @@ XBT_PUBLIC MPI_Info smpi_process_info_env(); XBT_PUBLIC void* smpi_process_get_user_data(); XBT_PUBLIC void smpi_process_set_user_data(void*); -XBT_PRIVATE void private_execute_flops(double flops); XBT_PUBLIC void smpi_execute_flops(double flops); XBT_PUBLIC void smpi_execute(double duration); XBT_PUBLIC void smpi_execute_benched(double duration); diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index f4b31ec0d0..1791625940 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -482,4 +482,6 @@ enum class SmpiPrivStrategies { NONE = 0, MMAP = 1, DLOPEN = 2, DEFAULT = DLOPEN extern XBT_PRIVATE SmpiPrivStrategies smpi_privatize_global_variables; +XBT_PRIVATE void private_execute_flops(double flops); + #endif diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index 8bf464a586..9b89d2424e 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -38,7 +38,7 @@ double smpi_host_speed; SharedMallocType smpi_cfg_shared_malloc = SharedMallocType::GLOBAL; double smpi_total_benched_time = 0; -// Private execute_flops used by smpi_execute and spmi_execute benched +// Private execute_flops used by smpi_execute and spmi_execute_benched void private_execute_flops(double flops) { xbt_assert(flops >= 0, "You're trying to execute a negative amount of flops (%f)!", flops); XBT_DEBUG("Handle real computation time: %f flops", flops);