From: Christian Heinrich Date: Mon, 23 Oct 2017 08:31:04 +0000 (+0200) Subject: [SMPI] Renamed global memory init function X-Git-Tag: v3.18~348^2~4 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a3ba0b940bed4d726f0a2e61aeb2721a02f0873a?hp=963e0c46bd55406b400150f42d57e6c6fbed2bb7 [SMPI] Renamed global memory init function This function is not used to initialize the segments any longer but to merely back up the segment. --- diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index b7a5081160..845724c6d6 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -93,7 +93,7 @@ XBT_PRIVATE void smpi_really_switch_data_segment(int dest); XBT_PRIVATE int smpi_is_privatization_file(char* file); XBT_PRIVATE void smpi_get_executable_global_size(); -XBT_PRIVATE void smpi_initialize_global_memory_segments(); +XBT_PRIVATE void smpi_backup_global_memory_segment(); XBT_PRIVATE void smpi_destroy_global_memory_segments(); XBT_PRIVATE void smpi_bench_destroy(); XBT_PRIVATE void smpi_bench_begin(); diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index b47e090c9c..7b6db073de 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -686,7 +686,7 @@ void SMPI_init(){ TRACE_smpi_alloc(); simgrid::surf::surfExitCallbacks.connect(TRACE_smpi_release); if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) - smpi_initialize_global_memory_segments(); + smpi_backup_global_memory_segment(); } void SMPI_finalize(){ diff --git a/src/smpi/internals/smpi_memory.cpp b/src/smpi/internals/smpi_memory.cpp index 642f46a45d..b3a9fd1488 100644 --- a/src/smpi/internals/smpi_memory.cpp +++ b/src/smpi/internals/smpi_memory.cpp @@ -137,14 +137,14 @@ int smpi_is_privatization_file(char* file) // TODO: cheinrich: The behavior changed; this now only makes a backup of the // data segment. I think the function should be renamed. -void smpi_initialize_global_memory_segments() +void smpi_backup_global_memory_segment() { #if HAVE_PRIVATIZATION smpi_get_executable_global_size(); XBT_DEBUG("bss+data segment found : size %d starting at %p", smpi_data_exe_size, smpi_data_exe_start); - if (smpi_data_exe_size == 0) { // no need to switch as global variables don't exist + if (smpi_data_exe_size == 0) { // no need to do anything as global variables don't exist smpi_privatize_global_variables=false; return; }