Remove unused constant; change const for constexpr.

[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 a6ea8dd..88b1ae8 100644 (file)
--- a/src/smpi/internals/smpi_memory.cpp
+++ b/src/smpi/internals/smpi_memory.cpp
@@ -39,11 +39,10 @@ static void* smpi_data_exe_copy;
 // Use a std::deque so that pointers remain valid after push_back().
 static std::deque<s_smpi_privatization_region_t> smpi_privatization_regions;
 
-static const int PROT_RWX = (PROT_READ | PROT_WRITE | PROT_EXEC);
-static const int PROT_RW  = (PROT_READ | PROT_WRITE );
-XBT_ATTRIB_UNUSED static const int PROT_RX  = (PROT_READ | PROT_EXEC );
+static constexpr int PROT_RWX = PROT_READ | PROT_WRITE | PROT_EXEC;
+static constexpr int PROT_RW  = PROT_READ | PROT_WRITE;
 
-void smpi_get_executable_global_size()
+static void smpi_get_executable_global_size()
 {
   char buffer[PATH_MAX];
   char* full_name = realpath(xbt_binary_name, buffer);
@@ -99,7 +98,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 +117,13 @@ 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);
+  void* tmp = mmap(TOPAGE(smpi_data_exe_start), smpi_data_exe_size, PROT_RW, 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,7 +140,7 @@ 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);
@@ -156,11 +154,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 = SmpiPrivStrategies::None;
-  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
@@ -199,7 +192,7 @@ Ask the Internet about tutorials on how to increase the files limit such as: htt
     xbt_die("Impossible to set the size of the temporary file for memory mapping");
 
   /* Ask for a free region */
-  address = mmap(nullptr, smpi_data_exe_size, PROT_READ | PROT_WRITE, MAP_SHARED, file_descriptor, 0);
+  address = mmap(nullptr, smpi_data_exe_size, PROT_RW, MAP_SHARED, file_descriptor, 0);
   if (address == MAP_FAILED)
     xbt_die("Couldn't find a free region for memory mapping");