X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1cc7b7d44384d887a2ed23a54cf8fa2bd78b990e..450b358183e53934a1185e4714387a9d824b0181:/src/kernel/resource/NetworkModel.cpp diff --git a/src/kernel/resource/NetworkModel.cpp b/src/kernel/resource/NetworkModel.cpp index 0e5aa79569..69dd1dcecd 100644 --- a/src/kernel/resource/NetworkModel.cpp +++ b/src/kernel/resource/NetworkModel.cpp @@ -6,9 +6,9 @@ #include #include "simgrid/sg_config.hpp" +#include "src/kernel/resource/FactorSet.hpp" #include "src/kernel/resource/NetworkModel.hpp" #include "src/kernel/resource/profile/Profile.hpp" -#include "src/smpi/include/smpi_utils.hpp" #include "src/surf/surf_interface.hpp" #include @@ -23,14 +23,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, t *********/ namespace simgrid::kernel::resource { -static smpi::utils::FactorSet cfg_latency_factor("network/latency-factor"); -static smpi::utils::FactorSet cfg_bandwidth_factor("network/bandwidth-factor"); +static FactorSet cfg_latency_factor("network/latency-factor"); +static FactorSet cfg_bandwidth_factor("network/bandwidth-factor"); config::Flag cfg_latency_factor_str( - "network/latency-factor", {{"smpi/lat-factor"}}, + "network/latency-factor", std::initializer_list{"smpi/lat-factor"}, "Correction factor to apply to the provided latency (default value overridden by network model)", "1.0"); static config::Flag cfg_bandwidth_factor_str( - "network/bandwidth-factor", {{"smpi/bw-factor"}}, + "network/bandwidth-factor", std::initializer_list{"smpi/bw-factor"}, "Correction factor to apply to the provided bandwidth (default value overridden by network model)", "1.0"); double NetworkModel::get_latency_factor(double size)