Change xbt_cfg_get_bool -> simgrid::config::get_config<bool>.

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

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index ebf13d8..5ff6ac3 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -5,26 +5,17 @@
 
 #include "SmpiHost.hpp"
 #include "mc/mc.h"
-#include "private.hpp"
 #include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Mailbox.hpp"
-#include "simgrid/s4u/forward.hpp"
 #include "smpi_coll.hpp"
-#include "smpi_comm.hpp"
-#include "smpi_group.hpp"
-#include "smpi_info.hpp"
 #include "smpi_process.hpp"
 #include "src/msg/msg_private.hpp"
 #include "src/simix/smx_private.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/config.hpp"
 
 #include <cfloat> /* DBL_MAX */
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <fstream>
-#include <sys/stat.h>
 
 #if HAVE_SENDFILE
 #include <sys/sendfile.h>
@@ -50,8 +41,8 @@ struct papi_process_data {
   papi_counter_t counter_data;
   int event_set;
 };
-
 #endif
+
 using simgrid::s4u::Actor;
 using simgrid::s4u::ActorPtr;
 std::unordered_map<std::string, double> location2speedup;
@@ -96,7 +87,7 @@ simgrid::smpi::Process* smpi_process()
   ActorPtr me = Actor::self();
   if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...)
     return nullptr;
-  simgrid::msg::ActorExt* msgExt = static_cast<simgrid::msg::ActorExt*>(me->getImpl()->userdata);
+  simgrid::msg::ActorExt* msgExt = static_cast<simgrid::msg::ActorExt*>(me->get_impl()->userdata);
   return static_cast<simgrid::smpi::Process*>(msgExt->data);
 }
 
@@ -114,7 +105,7 @@ void smpi_process_init(int *argc, char ***argv){
 }
 
 int smpi_process_index(){
-  return simgrid::s4u::this_actor::getPid();
+  return simgrid::s4u::this_actor::get_pid();
 }
 
 void * smpi_process_get_user_data(){
@@ -536,7 +527,7 @@ int smpi_main(const char* executable, int argc, char *argv[])
         // Load the copy and resolve the entry point:
         void* handle = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND);
         int saved_errno = errno;
-        if (xbt_cfg_get_boolean("smpi/keep-temps") == false)
+        if (simgrid::config::get_config<bool>("smpi/keep-temps") == false)
           unlink(target_executable.c_str());
         if (handle == nullptr)
           xbt_die("dlopen failed: %s (errno: %d -- %s)", dlerror(), saved_errno, strerror(saved_errno));
@@ -549,6 +540,8 @@ int smpi_main(const char* executable, int argc, char *argv[])
     };
   }
   else {
+    if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap)
+      smpi_prepare_global_memory_segment();
     // Load the dynamic library and resolve the entry point:
     void* handle = dlopen(executable, RTLD_LAZY | RTLD_LOCAL);
     if (handle == nullptr)
@@ -556,7 +549,8 @@ int smpi_main(const char* executable, int argc, char *argv[])
     smpi_entry_point_type entry_point = smpi_resolve_function(handle);
     if (not entry_point)
       xbt_die("main not found in %s", executable);
-    // TODO, register the executable for SMPI privatization
+    if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap)
+      smpi_backup_global_memory_segment();
 
     // Execute the same entry point for each simulated process:
     simix_global->default_function = [entry_point](std::vector<std::string> args) {
@@ -585,7 +579,7 @@ int smpi_main(const char* executable, int argc, char *argv[])
     SIMIX_run();
 
     xbt_os_walltimer_stop(global_timer);
-    if (xbt_cfg_get_boolean("smpi/display-timing")){
+    if (simgrid::config::get_config<bool>("smpi/display-timing")) {
       double global_time = xbt_os_timer_elapsed(global_timer);
       XBT_INFO("Simulated time: %g seconds. \n\n"
           "The simulation took %g seconds (after parsing and platform setup)\n"
@@ -622,10 +616,7 @@ void SMPI_init(){
   smpi_init_options();
   smpi_global_init();
   smpi_check_options();
-  TRACE_smpi_alloc();
   simgrid::s4u::onSimulationEnd.connect(TRACE_smpi_release);
-  if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap)
-    smpi_backup_global_memory_segment();
 }
 
 void SMPI_finalize(){