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
Prefer a reference for first parameter of {test,wait}_{all,any}.
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index 64ffdb6a879ca8561e93bc7fea319bff3376e876..169d528ed393b3954fba9f0de638c52a0b1e39ad 100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-23,8
+23,7
@@
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>();
- host_model->set_name("Host_Ptask");
+ 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);
}
@@
-32,24
+31,23
@@
void surf_host_model_init_ptask_L07()
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);
- auto net_model = std::make_shared<NetworkL07Model>(this, maxmin_system);
+ auto net_model = std::make_shared<NetworkL07Model>(
"Network_Ptask",
this, maxmin_system);
auto engine = simgrid::kernel::EngineImpl::get_instance();
- 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);
- cpu_model->set_name("Cpu_Ptask");
+ 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) : hostModel_(hmodel)
+CpuL07Model::CpuL07Model(const std::string& name, HostL07Model* hmodel, kernel::lmm::System* sys)
+ : CpuModel(name), hostModel_(hmodel)
{
set_maxmin_system(sys);
}
@@
-59,13
+57,14
@@
CpuL07Model::~CpuL07Model()
set_maxmin_system(nullptr);
}
-NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : 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")})
+
->set_sharing_policy(
s4u::Link::SharingPolicy::FATPIPE)
+ ->set_latency(simgrid::config::get_value<double>("network/loopback-lat"));
loopback_->seal();
}
@@
-106,9
+105,8
@@
void HostL07Model::update_actions_state(double /*now*/, double delta)
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());
@@
-195,10
+193,10
@@
L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host
* 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())
@@
-235,18
+233,21
@@
kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host
return res;
}
-kernel::resource::Cpu* CpuL07Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
+kernel::resource::Cpu
Impl
* 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.");
- auto link = new LinkL07(name, bandwidths[0], policy, get_maxmin_system());
- link->set_model(this);
- return link;
+ return (new LinkL07(name, bandwidths[0], get_maxmin_system()))->set_model(this);
+}
+
+kernel::resource::LinkImpl* NetworkL07Model::create_wifi_link(const std::string& name,
+ const std::vector<double>& bandwidths)
+{
+ THROW_UNIMPLEMENTED;
}
/************
@@
-293,18
+294,13
@@
void CpuL07::on_speed_change()
get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak);
}
- Cpu::on_speed_change();
+ Cpu
Impl
::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