From: Arnaud Giersch Date: Thu, 19 Apr 2018 11:03:03 +0000 (+0200) Subject: Change xbt_cfg_get_string -> simgrid::config::get_config. X-Git-Tag: v3.20~376 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1fada0c05d54537c3d7545b45dd00d69424379d7 Change xbt_cfg_get_string -> simgrid::config::get_config. --- diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 37a1015ea1..4acb268f48 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -86,7 +86,7 @@ int TRACE_start() /* init the tracing module to generate the right output */ /* open the trace file(s) */ - std::string format = xbt_cfg_get_string(OPT_TRACING_FORMAT); + std::string format = simgrid::config::get_config(OPT_TRACING_FORMAT); XBT_DEBUG("Tracing format %s\n", format.c_str()); if (format == "Paje") { TRACE_paje_start(); @@ -125,7 +125,7 @@ int TRACE_end() delete root_type; /* close the trace files */ - std::string format = xbt_cfg_get_string(OPT_TRACING_FORMAT); + std::string format = simgrid::config::get_config(OPT_TRACING_FORMAT); XBT_DEBUG("Tracing format %s\n", format.c_str()); if (format == "Paje") { TRACE_paje_end(); @@ -241,12 +241,12 @@ bool TRACE_display_sizes () std::string TRACE_get_comment() { - return xbt_cfg_get_string(OPT_TRACING_COMMENT); + return simgrid::config::get_config(OPT_TRACING_COMMENT); } std::string TRACE_get_comment_file() { - return xbt_cfg_get_string(OPT_TRACING_COMMENT_FILE); + return simgrid::config::get_config(OPT_TRACING_COMMENT_FILE); } int TRACE_precision () @@ -256,7 +256,7 @@ int TRACE_precision () std::string TRACE_get_filename() { - return xbt_cfg_get_string(OPT_TRACING_FILENAME); + return simgrid::config::get_config(OPT_TRACING_FILENAME); } void TRACE_global_init() diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index 2cc924bc80..719f7d6fae 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -107,7 +107,7 @@ void SIMIX_context_mod_init() #endif #if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__)) - std::string priv = xbt_cfg_get_string("smpi/privatization"); + std::string priv = simgrid::config::get_config("smpi/privatization"); if (context_factory_name == "thread" && (priv == "dlopen" || priv == "yes" || priv == "default" || priv == "1")) { XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts."); context_factory_name = "raw"; @@ -115,7 +115,7 @@ void SIMIX_context_mod_init() #endif #if HAVE_SMPI && defined(__FreeBSD__) - if (context_factory_name == "thread" && xbt_cfg_get_string("smpi/privatization") != "no"){ + if (context_factory_name == "thread" && simgrid::config::get_config("smpi/privatization") != "no") { XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts."); context_factory_name = "raw"; } diff --git a/src/smpi/colls/smpi_coll.cpp b/src/smpi/colls/smpi_coll.cpp index 59425a3777..2423713019 100644 --- a/src/smpi/colls/smpi_coll.cpp +++ b/src/smpi/colls/smpi_coll.cpp @@ -26,7 +26,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll } #define SET_COLL(coll) \ - name = xbt_cfg_get_string("smpi/" #coll); \ + name = simgrid::config::get_config("smpi/" #coll); \ if (name.empty()) \ name = selector_name; \ set_##coll(name); @@ -101,7 +101,7 @@ COLL_APPLY(COLL_SETTER,COLL_ALLTOALLV_SIG,""); void Colls::set_collectives(){ - std::string selector_name = xbt_cfg_get_string("smpi/coll-selector"); + std::string selector_name = simgrid::config::get_config("smpi/coll-selector"); if (selector_name.empty()) selector_name = "default"; diff --git a/src/smpi/internals/SmpiHost.cpp b/src/smpi/internals/SmpiHost.cpp index 016072846f..357b978f6f 100644 --- a/src/smpi/internals/SmpiHost.cpp +++ b/src/smpi/internals/SmpiHost.cpp @@ -97,21 +97,21 @@ SmpiHost::SmpiHost(simgrid::s4u::Host *ptr) : host(ptr) if (orecv_string != nullptr) { orecv_parsed_values = parse_factor(orecv_string); } else { - orecv_parsed_values = parse_factor(xbt_cfg_get_string("smpi/or")); + orecv_parsed_values = parse_factor(simgrid::config::get_config("smpi/or")); } const char* osend_string = host->getProperty("smpi/os"); if (osend_string != nullptr) { osend_parsed_values = parse_factor(osend_string); } else { - osend_parsed_values = parse_factor(xbt_cfg_get_string("smpi/os")); + osend_parsed_values = parse_factor(simgrid::config::get_config("smpi/os")); } const char* oisend_string = host->getProperty("smpi/ois"); if (oisend_string != nullptr) { oisend_parsed_values = parse_factor(oisend_string); } else { - oisend_parsed_values = parse_factor(xbt_cfg_get_string("smpi/ois")); + oisend_parsed_values = parse_factor(simgrid::config::get_config("smpi/ois")); } } diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index fcd845352e..ac1a8eb1bd 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -90,7 +90,7 @@ void smpi_bench_begin() return; #if HAVE_PAPI - if (not xbt_cfg_get_string("smpi/papi-events").empty()) { + if (not simgrid::config::get_config("smpi/papi-events").empty()) { int event_set = smpi_process()->papi_event_set(); // PAPI_start sets everything to 0! See man(3) PAPI_start if (PAPI_LOW_LEVEL_INITED == PAPI_is_initialized()) { @@ -119,7 +119,7 @@ void smpi_bench_end() * An MPI function has been called and now is the right time to update * our PAPI counters for this process. */ - if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0') { + if (simgrid::config::get_config("smpi/papi-events")[0] != '\0') { papi_counter_t& counter_data = smpi_process()->papi_counters(); int event_set = smpi_process()->papi_event_set(); std::vector event_values = std::vector(counter_data.size()); @@ -142,8 +142,8 @@ void smpi_bench_end() xbt_die("Aborting."); } - if (xbt_cfg_get_string("smpi/comp-adjustment-file")[0] != '\0') { // Maybe we need to artificially speed up or slow - // down our computation based on our statistical analysis. + // Maybe we need to artificially speed up or slow down our computation based on our statistical analysis. + if (simgrid::config::get_config("smpi/comp-adjustment-file")[0] != '\0') { smpi_trace_call_location_t* loc = smpi_process()->call_location(); std::string key = loc->get_composed_key(); @@ -159,7 +159,7 @@ void smpi_bench_end() } #if HAVE_PAPI - if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) { + if (simgrid::config::get_config("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) { container_t container = new simgrid::instr::Container(std::string("rank-") + std::to_string(simgrid::s4u::this_actor::get_pid())); papi_counter_t& counter_data = smpi_process()->papi_counters(); diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 6e379ab8dd..5d59dac8bb 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -244,7 +244,7 @@ void smpi_global_init() xbt_os_walltimer_start(global_timer); } - std::string filename = xbt_cfg_get_string("smpi/comp-adjustment-file"); + std::string filename = simgrid::config::get_config("smpi/comp-adjustment-file"); if (not filename.empty()) { std::ifstream fstream(filename); if (not fstream.is_open()) { @@ -271,7 +271,7 @@ void smpi_global_init() // and the (computed) event_set. std::map units2papi_setup; - if (not xbt_cfg_get_string("smpi/papi-events").empty()) { + if (not simgrid::config::get_config("smpi/papi-events").empty()) { if (PAPI_library_init(PAPI_VER_CURRENT) != PAPI_VER_CURRENT) XBT_ERROR("Could not initialize PAPI library; is it correctly installed and linked?" " Expected version is %i", @@ -279,7 +279,7 @@ void smpi_global_init() typedef boost::tokenizer> Tokenizer; boost::char_separator separator_units(";"); - std::string str = xbt_cfg_get_string("smpi/papi-events"); + std::string str = simgrid::config::get_config("smpi/papi-events"); Tokenizer tokens(str, separator_units); // Iterate over all the computational units. This could be processes, hosts, threads, ranks... You name it. @@ -363,7 +363,7 @@ static void smpi_init_options(){ smpi_cpu_threshold = simgrid::config::get_config("smpi/cpu-threshold"); smpi_host_speed = simgrid::config::get_config("smpi/host-speed"); xbt_assert(smpi_host_speed >= 0, "You're trying to set the host_speed to a negative value (%f)", smpi_host_speed); - std::string smpi_privatize_option = xbt_cfg_get_string("smpi/privatization"); + std::string smpi_privatize_option = simgrid::config::get_config("smpi/privatization"); if (smpi_privatize_option == "no" || smpi_privatize_option == "0") smpi_privatize_global_variables = SmpiPrivStrategies::None; else if (smpi_privatize_option == "yes" || smpi_privatize_option == "1") @@ -389,7 +389,7 @@ static void smpi_init_options(){ if (smpi_cpu_threshold < 0) smpi_cpu_threshold = DBL_MAX; - std::string val = xbt_cfg_get_string("smpi/shared-malloc"); + std::string val = simgrid::config::get_config("smpi/shared-malloc"); if ((val == "yes") || (val == "1") || (val == "on") || (val == "global")) { smpi_cfg_shared_malloc = shmalloc_global; } else if (val == "local") { diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index 91fe28a5a8..4f9ac07319 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -30,7 +30,7 @@ Process::Process(ActorPtr actor, msg_bar_t finalization_barrier) MC_ignore_heap(timer_, xbt_os_timer_size()); #if HAVE_PAPI - if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0') { + if (simgrid::config::get_config("smpi/papi-events")[0] != '\0') { // TODO: Implement host/process/thread based counters. This implementation // just always takes the values passed via "default", like this: // "default:COUNTER1:COUNTER2:COUNTER3;". diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp index 358a78a5a2..d3f6899812 100644 --- a/src/smpi/internals/smpi_shared.cpp +++ b/src/smpi/internals/smpi_shared.cpp @@ -193,7 +193,7 @@ static void *smpi_shared_malloc_local(size_t size, const char *file, int line) void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int nb_shared_blocks) { - std::string huge_page_mount_point = xbt_cfg_get_string("smpi/shared-malloc-hugepage"); + std::string huge_page_mount_point = simgrid::config::get_config("smpi/shared-malloc-hugepage"); bool use_huge_page = not huge_page_mount_point.empty(); #ifndef MAP_HUGETLB /* If the system header don't define that mmap flag */ xbt_assert(not use_huge_page, diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index ccd09c7e91..727ccced5b 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -132,9 +132,10 @@ namespace kernel { namespace resource { NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool)) - : NetworkModel(xbt_cfg_get_string("network/optim") == "Full" ? Model::UpdateAlgo::Full : Model::UpdateAlgo::Lazy) + : NetworkModel(simgrid::config::get_config("network/optim") == "Full" ? Model::UpdateAlgo::Full + : Model::UpdateAlgo::Lazy) { - std::string optim = xbt_cfg_get_string("network/optim"); + std::string optim = simgrid::config::get_config("network/optim"); bool select = simgrid::config::get_config("network/maxmin-selective-update"); if (optim == "Lazy") { diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index bbba768abf..14bf4828df 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -103,7 +103,7 @@ namespace resource { NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() { - std::string IB_factors_string = xbt_cfg_get_string("smpi/IB-penalty-factors"); + std::string IB_factors_string = simgrid::config::get_config("smpi/IB-penalty-factors"); std::vector radical_elements; boost::split(radical_elements, IB_factors_string, boost::is_any_of(";")); diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index 4189c00eb6..1531bc0ce1 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -52,7 +52,7 @@ NetworkSmpiModel::~NetworkSmpiModel() = default; double NetworkSmpiModel::bandwidthFactor(double size) { if (smpi_bw_factor.empty()) - smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor")); + smpi_bw_factor = parse_factor(simgrid::config::get_config("smpi/bw-factor")); double current = 1.0; for (auto const& fact : smpi_bw_factor) { @@ -70,7 +70,7 @@ double NetworkSmpiModel::bandwidthFactor(double size) double NetworkSmpiModel::latencyFactor(double size) { if (smpi_lat_factor.empty()) - smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor")); + smpi_lat_factor = parse_factor(simgrid::config::get_config("smpi/lat-factor")); double current = 1.0; for (auto const& fact : smpi_lat_factor) { diff --git a/src/surf/plugins/host_dvfs.cpp b/src/surf/plugins/host_dvfs.cpp index 993a39710e..e9d98bc7c6 100644 --- a/src/surf/plugins/host_dvfs.cpp +++ b/src/surf/plugins/host_dvfs.cpp @@ -245,7 +245,7 @@ static void on_host_added(simgrid::s4u::Host& host) dvfs_governor = std::string(daemon_proc->get_host()->getProperty(property_governor)); boost::algorithm::to_lower(dvfs_governor); } else { - dvfs_governor = xbt_cfg_get_string(property_governor); + dvfs_governor = simgrid::config::get_config(property_governor); boost::algorithm::to_lower(dvfs_governor); } diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 472a5a5362..ef5d72b16c 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -500,10 +500,10 @@ void sg_platf_end() { /* Pick the right models for CPU, net and host, and call their model_init_preparse */ static void surf_config_models_setup() { - std::string host_model_name = xbt_cfg_get_string("host/model"); - std::string network_model_name = xbt_cfg_get_string("network/model"); - std::string cpu_model_name = xbt_cfg_get_string("cpu/model"); - std::string storage_model_name = xbt_cfg_get_string("storage/model"); + std::string host_model_name = simgrid::config::get_config("host/model"); + std::string network_model_name = simgrid::config::get_config("network/model"); + std::string cpu_model_name = simgrid::config::get_config("cpu/model"); + std::string storage_model_name = simgrid::config::get_config("storage/model"); /* The compound host model is needed when using non-default net/cpu models */ if ((not xbt_cfg_is_default_value("network/model") || not xbt_cfg_is_default_value("cpu/model")) &&