A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No more types for models.
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
d735582
..
bb1e4d1
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-24,8
+24,8
@@
void surf_host_model_init_ptask_L07()
XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks.");
auto host_model = std::make_shared<simgrid::surf::HostL07Model>();
XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks.");
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
);
+ host_model->set_name("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);
}
simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
}
@@
-39,16
+39,17
@@
HostL07Model::HostL07Model() : HostModel()
auto net_model = std::make_shared<NetworkL07Model>(this, maxmin_system);
auto engine = simgrid::kernel::EngineImpl::get_instance();
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);
+ net_model->set_name("Network_Ptask");
+ 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>(this, maxmin_system);
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);
+ cpu_model->set_name("Cpu_Ptask");
+ engine->add_model(cpu_model, {});
simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_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(HostL07Model* hmodel, kernel::lmm::System* sys) : hostModel_(hmodel)
{
set_maxmin_system(sys);
}
{
set_maxmin_system(sys);
}
@@
-58,8
+59,7
@@
CpuL07Model::~CpuL07Model()
set_maxmin_system(nullptr);
}
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(
{
set_maxmin_system(sys);
loopback_ = NetworkL07Model::create_link(
@@
-284,11
+284,10
@@
bool CpuL07::is_used() const
/** @brief take into account changes of speed (either load or max) */
void CpuL07::on_speed_change()
{
/** @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);
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);
const kernel::resource::Action* action = var->get_id();
get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak);
@@
-370,13
+369,11
@@
void LinkL07::set_bandwidth(double value)
kernel::resource::LinkImpl* LinkL07::set_latency(double value)
{
latency_check(value);
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;
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
)) {
+ a
uto* a
ction = static_cast<L07Action*>(var->get_id());
action->updateBound();
}
return this;
action->updateBound();
}
return this;