X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3625e2b5b3077b38b70da8e345175568938738a..HEAD:/src/kernel/resource/NetworkModelFactors.cpp diff --git a/src/kernel/resource/NetworkModelFactors.cpp b/src/kernel/resource/NetworkModelFactors.cpp index 79526a3787..3e9f8cf278 100644 --- a/src/kernel/resource/NetworkModelFactors.cpp +++ b/src/kernel/resource/NetworkModelFactors.cpp @@ -1,11 +1,10 @@ -/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/resource/NetworkModelFactors.hpp" -#include "simgrid/sg_config.hpp" -#include "src/kernel/resource/FactorSet.hpp" +#include "src/simgrid/sg_config.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network); @@ -14,9 +13,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network); *********/ namespace simgrid::kernel::resource { -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", std::initializer_list{"smpi/lat-factor"}, "Correction factor to apply to the provided latency (default value overridden by network model)", "1.0"); @@ -24,6 +20,9 @@ static config::Flag cfg_bandwidth_factor_str( "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"); +FactorSet NetworkModelFactors::cfg_latency_factor("network/latency-factor"); +FactorSet NetworkModelFactors::cfg_bandwidth_factor("network/bandwidth-factor"); + double NetworkModelFactors::get_bandwidth_factor() const { xbt_assert(not bw_factor_cb_,