Change xbt_cfg_get_int -> simgrid::config::get_config<int>.

[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 79c7a6e..f2a5b48 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;
@@ -223,21 +214,23 @@ void smpi_comm_null_copy_buffer_callback(smx_activity_t comm, void *buff, size_t
   /* nothing done in this version */
 }
 
-static void smpi_check_options(){
+static void smpi_check_options()
+{
   //check correctness of MPI parameters
 
-   xbt_assert(xbt_cfg_get_int("smpi/async-small-thresh") <= xbt_cfg_get_int("smpi/send-is-detached-thresh"));
+  xbt_assert(simgrid::config::get_config<int>("smpi/async-small-thresh") <=
+             simgrid::config::get_config<int>("smpi/send-is-detached-thresh"));
 
-   if (xbt_cfg_is_default_value("smpi/host-speed")) {
-     XBT_INFO("You did not set the power of the host running the simulation.  "
-              "The timings will certainly not be accurate.  "
-              "Use the option \"--cfg=smpi/host-speed:<flops>\" to set its value."
-              "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.");
-   }
+  if (xbt_cfg_is_default_value("smpi/host-speed")) {
+    XBT_INFO("You did not set the power of the host running the simulation.  "
+             "The timings will certainly not be accurate.  "
+             "Use the option \"--cfg=smpi/host-speed:<flops>\" to set its value."
+             "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.");
+  }
 
-   xbt_assert(xbt_cfg_get_double("smpi/cpu-threshold") >=0,
-       "The 'smpi/cpu-threshold' option cannot have negative values [anymore]. If you want to discard "
-       "the simulation of any computation, please use 'smpi/simulate-computation:no' instead.");
+  xbt_assert(xbt_cfg_get_double("smpi/cpu-threshold") >= 0,
+             "The 'smpi/cpu-threshold' option cannot have negative values [anymore]. If you want to discard "
+             "the simulation of any computation, please use 'smpi/simulate-computation:no' instead.");
 }
 
 int smpi_enabled() {
@@ -536,7 +529,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 +542,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)
@@ -586,7 +581,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"
@@ -623,7 +618,6 @@ void SMPI_init(){
   smpi_init_options();
   smpi_global_init();
   smpi_check_options();
-  TRACE_smpi_alloc();
   simgrid::s4u::onSimulationEnd.connect(TRACE_smpi_release);
 }