* 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"
void surf_host_model_init_ptask_L07()
{
XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks.");
- xbt_assert(not surf_cpu_model_pm, "Cannot switch to ptasks: CPU model already defined");
- xbt_assert(not surf_network_model, "Cannot switch to ptasks: network model already defined");
- surf_host_model = new simgrid::surf::HostL07Model();
- all_existing_models.push_back(surf_host_model);
+ auto host_model = std::make_shared<simgrid::surf::HostL07Model>("Host_Ptask");
+ simgrid::kernel::EngineImpl::get_instance()->add_model(host_model);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
}
namespace simgrid {
namespace surf {
-HostL07Model::HostL07Model() : HostModel()
+HostL07Model::HostL07Model(const std::string& name) : HostModel(name)
{
auto* maxmin_system = new simgrid::kernel::lmm::FairBottleneck(true /* selective update */);
set_maxmin_system(maxmin_system);
- surf_network_model = new NetworkL07Model(this, maxmin_system);
- surf_cpu_model_pm = new CpuL07Model(this, maxmin_system);
-}
-HostL07Model::~HostL07Model()
-{
- delete surf_network_model;
- delete surf_cpu_model_pm;
+ auto net_model = std::make_shared<NetworkL07Model>("Network_Ptask", this, maxmin_system);
+ auto engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(net_model);
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
+
+ auto cpu_model = std::make_shared<CpuL07Model>("Cpu_Ptask", this, maxmin_system);
+ engine->add_model(cpu_model);
+ 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(const std::string& name, HostL07Model* hmodel, kernel::lmm::System* sys)
+ : CpuModel(name), 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(const std::string& name, HostL07Model* hmodel, kernel::lmm::System* sys)
+ : NetworkModel(name), hostModel_(hmodel)
{
set_maxmin_system(sys);
- loopback_ = NetworkL07Model::create_link(
- "__loopback__", std::vector<double>{simgrid::config::get_value<double>("network/loopback-bw")},
- s4u::Link::SharingPolicy::FATPIPE)
- ->set_latency(simgrid::config::get_value<double>("network/loopback-lat"));
+ loopback_ =
+ create_link("__loopback__", std::vector<double>{simgrid::config::get_value<double>("network/loopback-bw")});
+ loopback_->set_sharing_policy(s4u::Link::SharingPolicy::FATPIPE);
+ loopback_->set_latency(simgrid::config::get_value<double>("network/loopback-lat"));
loopback_->seal();
}
action.set_last_update();
}
}
- XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(),
- action.get_variable()->get_value() * delta);
- action.update_remains(action.get_variable()->get_value() * delta);
+ XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(), action.get_rate() * delta);
+ action.update_remains(action.get_rate() * delta);
action.update_max_duration(delta);
XBT_DEBUG("Action (%p) : remains (%g).", &action, action.get_remains());
* communication either */
double bound = std::numeric_limits<double>::max();
for (size_t i = 0; i < host_list.size(); i++) {
- model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(),
+ model->get_maxmin_system()->expand(host_list[i]->get_cpu()->get_constraint(), get_variable(),
(flops_amount == nullptr ? 0.0 : flops_amount[i]));
if (flops_amount && flops_amount[i] > 0)
- bound = std::min(bound, host_list[i]->pimpl_cpu->get_speed(1.0) * host_list[i]->pimpl_cpu->get_speed_ratio() /
+ bound = std::min(bound, host_list[i]->get_cpu()->get_speed(1.0) * host_list[i]->get_cpu()->get_speed_ratio() /
flops_amount[i]);
}
if (bound < std::numeric_limits<double>::max())
return res;
}
-kernel::resource::Cpu* CpuL07Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
+kernel::resource::CpuImpl* CpuL07Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
{
return (new CpuL07(host, speed_per_pstate))->set_model(this);
}
-kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector<double>& bandwidths,
- s4u::Link::SharingPolicy policy)
+kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector<double>& bandwidths)
{
xbt_assert(bandwidths.size() == 1, "Non WIFI link must have only 1 bandwidth.");
- return new LinkL07(name, bandwidths[0], policy, get_maxmin_system());
+ auto link = new LinkL07(name, bandwidths[0], get_maxmin_system());
+ link->set_model(this);
+ return link;
+}
+
+kernel::resource::LinkImpl* NetworkL07Model::create_wifi_link(const std::string& name,
+ const std::vector<double>& bandwidths)
+{
+ THROW_UNIMPLEMENTED;
}
/************
/** @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);
}
- Cpu::on_speed_change();
+ CpuImpl::on_speed_change();
}
-LinkL07::LinkL07(const std::string& name, double bandwidth, s4u::Link::SharingPolicy policy,
- kernel::lmm::System* system)
- : LinkImpl(name)
+LinkL07::LinkL07(const std::string& name, double bandwidth, kernel::lmm::System* system) : LinkImpl(name)
{
this->set_constraint(system->constraint_new(this, bandwidth));
bandwidth_.peak = bandwidth;
-
- if (policy == s4u::Link::SharingPolicy::FATPIPE)
- get_constraint()->unshare();
}
bool LinkL07::is_used() const
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), bandwidth_.peak * bandwidth_.scale);
}
-kernel::resource::LinkImpl* LinkL07::set_latency(double value)
+void 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;
}
LinkL07::~LinkL07() = default;