X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00b7af7facf98352f589aaca5a023feffac762bb..ab4d43a39df33bb5f24c3b2cc6d576130b16a649:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index edbbf716e4..f2a5b48c51 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -214,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("smpi/async-small-thresh") <= + simgrid::config::get_config("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:\" 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:\" 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() { @@ -527,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("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)); @@ -579,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("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"