Cosmetics.

[simgrid.git] / src / smpi / internals / smpi_memory.cpp

diff --git a/src/smpi/internals/smpi_memory.cpp b/src/smpi/internals/smpi_memory.cpp
index e704823..e633e7a 100644 (file)
--- a/src/smpi/internals/smpi_memory.cpp
+++ b/src/smpi/internals/smpi_memory.cpp
@@ -30,7 +30,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_memory, smpi, "Memory layout support for SM
 int smpi_loaded_page      = -1;
 char* smpi_data_exe_start = nullptr;
 int smpi_data_exe_size    = 0;
-int smpi_privatize_global_variables;
+SmpiPrivStrategies smpi_privatize_global_variables;
 static void* smpi_data_exe_copy;
 
 // We keep a copy of all the privatization regions: We can then delete everything easily by iterating over this
@@ -99,7 +99,7 @@ static void* asan_safe_memcpy(void* dest, void* src, size_t n)
 /** Map a given SMPI privatization segment (make a SMPI process active) */
 void smpi_switch_data_segment(simgrid::s4u::ActorPtr actor)
 {
-  if (smpi_loaded_page == actor->getPid()) // no need to switch, we've already loaded the one we want
+  if (smpi_loaded_page == actor->get_pid()) // no need to switch, we've already loaded the one we want
     return;
 
   // So the job:
@@ -118,14 +118,14 @@ void smpi_really_switch_data_segment(simgrid::s4u::ActorPtr actor)
 
 #if HAVE_PRIVATIZATION
   // FIXME, cross-process support (mmap across process when necessary)
-  XBT_DEBUG("Switching data frame to the one of process %ld", actor->getPid());
+  XBT_DEBUG("Switching data frame to the one of process %ld", actor->get_pid());
   simgrid::smpi::Process* process = smpi_process_remote(actor);
   int current                     = process->privatized_region()->file_descriptor;
   void* tmp =
       mmap(TOPAGE(smpi_data_exe_start), smpi_data_exe_size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, current, 0);
   if (tmp != TOPAGE(smpi_data_exe_start))
     xbt_die("Couldn't map the new region (errno %d): %s", errno, strerror(errno));
-  smpi_loaded_page = actor->getPid();
+  smpi_loaded_page = actor->get_pid();
 #endif
 }
 
@@ -142,13 +142,13 @@ int smpi_is_privatization_file(char* file)
  */
 void smpi_backup_global_memory_segment()
 {
-#if HAVE_PRIVATIZATION
+  xbt_assert(HAVE_PRIVATIZATION, "You are trying to use privatization on a system that does not support it. Don't.");
   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 do anything as global variables don't exist
-    smpi_privatize_global_variables=false;
+    smpi_privatize_global_variables = SmpiPrivStrategies::None;
     return;
   }
 
@@ -156,11 +156,6 @@ void smpi_backup_global_memory_segment()
   // Make a copy of the data segment. This clean copy is retained over the whole runtime
   // of the simulation and can be used to initialize a dynamically added, new process.
   asan_safe_memcpy(smpi_data_exe_copy, TOPAGE(smpi_data_exe_start), smpi_data_exe_size);
-#else /* ! HAVE_PRIVATIZATION */
-  smpi_privatize_global_variables = false;
-  xbt_die("You are trying to use privatization on a system that does not support it. Don't.");
-  return;
-#endif
 }
 
 // Initializes the memory mapping for a single process and returns the privatization region