* under the terms of the license (GNU LGPL) which comes with this package. */
#include "ptask_L07.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/profile/Event.hpp"
#include "surf/surf.hpp"
#include "xbt/config.hpp"
{
XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks.");
- surf_host_model = new simgrid::surf::HostL07Model();
- all_existing_models.push_back(surf_host_model);
- models_by_type[simgrid::kernel::resource::Model::Type::HOST].push_back(surf_host_model);
+ auto host_model = std::make_shared<simgrid::surf::HostL07Model>();
+ simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::HOST, host_model,
+ true);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
}
namespace simgrid {
{
auto* maxmin_system = new simgrid::kernel::lmm::FairBottleneck(true /* selective update */);
set_maxmin_system(maxmin_system);
- network_model_ = std::make_unique<NetworkL07Model>(this, maxmin_system);
- models_by_type[simgrid::kernel::resource::Model::Type::NETWORK].push_back(network_model_.get());
- cpu_model_pm_ = std::make_unique<CpuL07Model>(this, maxmin_system);
- models_by_type[simgrid::kernel::resource::Model::Type::CPU_PM].push_back(cpu_model_pm_.get());
-}
-HostL07Model::~HostL07Model() {}
+ auto net_model = std::make_shared<NetworkL07Model>(this, maxmin_system);
+ auto engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(simgrid::kernel::resource::Model::Type::NETWORK, net_model, true);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
+
+ auto cpu_model = std::make_shared<CpuL07Model>(this, maxmin_system);
+ engine->add_model(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model, true);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model);
+}
-CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
- : CpuModel(Model::UpdateAlgo::FULL), hostModel_(hmodel)
+CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : hostModel_(hmodel)
{
set_maxmin_system(sys);
}
set_maxmin_system(nullptr);
}
-NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
- : NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel)
+NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : hostModel_(hmodel)
{
set_maxmin_system(sys);
loopback_ = NetworkL07Model::create_link(
/** @brief take into account changes of speed (either load or max) */
void CpuL07::on_speed_change()
{
- const kernel::lmm::Variable* var;
const kernel::lmm::Element* elem = nullptr;
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale);
- while ((var = get_constraint()->get_variable(&elem))) {
+ while (const auto* var = get_constraint()->get_variable(&elem)) {
const kernel::resource::Action* action = var->get_id();
get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak);
kernel::resource::LinkImpl* LinkL07::set_latency(double value)
{
latency_check(value);
- const kernel::lmm::Variable* var;
- L07Action* action;
const kernel::lmm::Element* elem = nullptr;
latency_.peak = value;
- while ((var = get_constraint()->get_variable(&elem))) {
- action = static_cast<L07Action*>(var->get_id());
+ while (const auto* var = get_constraint()->get_variable(&elem)) {
+ auto* action = static_cast<L07Action*>(var->get_id());
action->updateBound();
}
return this;