/* 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 "ptask_L07.hpp"
-#include "simgrid/kernel/routing/NetZoneImpl.hpp"
-#include "simgrid/s4u/Engine.hpp"
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <xbt/config.hpp>
+
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/profile/Event.hpp"
-#include "surf/surf.hpp"
-#include "xbt/config.hpp"
+#include "src/surf/ptask_L07.hpp"
#include <unordered_set>
{
XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks.");
- 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);
+ auto host_model = std::make_shared<simgrid::kernel::resource::HostL07Model>("Host_Ptask");
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(host_model);
+ engine->get_netzone_root()->set_host_model(host_model);
}
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
HostL07Model::HostL07Model(const std::string& name) : HostModel(name)
{
- auto* maxmin_system = new simgrid::kernel::lmm::FairBottleneck(true /* selective update */);
+ auto* maxmin_system = new lmm::FairBottleneck(true /* selective update */);
set_maxmin_system(maxmin_system);
auto net_model = std::make_shared<NetworkL07Model>("Network_Ptask", this, maxmin_system);
- auto engine = simgrid::kernel::EngineImpl::get_instance();
+ auto engine = EngineImpl::get_instance();
engine->add_model(net_model);
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
+ engine->get_netzone_root()->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);
+ engine->get_netzone_root()->set_cpu_pm_model(cpu_model);
}
-CpuL07Model::CpuL07Model(const std::string& name, HostL07Model* hmodel, kernel::lmm::System* sys)
+CpuL07Model::CpuL07Model(const std::string& name, HostL07Model* hmodel, lmm::System* sys)
: CpuModel(name), hostModel_(hmodel)
{
set_maxmin_system(sys);
set_maxmin_system(nullptr);
}
-NetworkL07Model::NetworkL07Model(const std::string& name, HostL07Model* hmodel, kernel::lmm::System* sys)
+NetworkL07Model::NetworkL07Model(const std::string& name, HostL07Model* hmodel, lmm::System* sys)
: NetworkModel(name), hostModel_(hmodel)
{
set_maxmin_system(sys);
- 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_ = create_link("__loopback__", {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();
}
double HostL07Model::next_occurring_event(double now)
{
double min = HostModel::next_occurring_event_full(now);
- for (kernel::resource::Action const& action : *get_started_action_set()) {
+ for (Action const& action : *get_started_action_set()) {
const auto& net_action = static_cast<const L07Action&>(action);
if (net_action.get_latency() > 0 && (min < 0 || net_action.get_latency() < min)) {
min = net_action.get_latency();
if (((action.get_remains() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
- action.finish(kernel::resource::Action::State::FINISHED);
+ action.finish(Action::State::FINISHED);
continue;
}
/* Need to check that none of the model has failed */
int i = 0;
- const kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
+ const lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
while (cnst != nullptr) {
i++;
- const kernel::resource::Resource* constraint_id = cnst->get_id();
+ const Resource* constraint_id = cnst->get_id();
if (not constraint_id->is_on()) {
XBT_DEBUG("Action (%p) Failed!!", &action);
- action.finish(kernel::resource::Action::State::FAILED);
+ action.finish(Action::State::FAILED);
break;
}
cnst = action.get_variable()->get_constraint(i);
}
}
-kernel::resource::CpuAction* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& host_list,
- const double* flops_amount, const double* bytes_amount,
- double rate)
+CpuAction* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
+ const double* bytes_amount, double rate)
{
return new L07Action(this, host_list, flops_amount, bytes_amount, rate);
}
-L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host*>& host_list,
- const double* flops_amount, const double* bytes_amount, double rate)
+L07Action::L07Action(Model* model, const std::vector<s4u::Host*>& host_list, const double* flops_amount,
+ const double* bytes_amount, double rate)
: CpuAction(model, 1.0, false), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate)
{
size_t link_nb = 0;
continue;
double lat = 0.0;
- std::vector<kernel::resource::LinkImpl*> route;
+ std::vector<StandardLinkImpl*> route;
hostList_[k / host_list.size()]->route_to(hostList_[k % host_list.size()], route, &lat);
latency = std::max(latency, lat);
/* Expand it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no
* 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() /
- flops_amount[i]);
}
- if (bound < std::numeric_limits<double>::max())
- model->get_maxmin_system()->update_variable_bound(get_variable(), bound);
if (bytes_amount != nullptr) {
for (size_t k = 0; k < host_list.size() * host_list.size(); k++) {
if (bytes_amount[k] <= 0.0)
continue;
- std::vector<kernel::resource::LinkImpl*> route;
+ std::vector<StandardLinkImpl*> route;
hostList_[k / host_list.size()]->route_to(hostList_[k % host_list.size()], route, nullptr);
for (auto const& link : route)
this->set_cost(1.0);
this->set_remains(0.0);
}
+ /* finally calculate the initial bound value */
+ updateBound();
}
-kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
+Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
std::vector<s4u::Host*> host_list = {src, dst};
const auto* flops_amount = new double[2]();
bytes_amount[1] = size;
- kernel::resource::Action* res = hostModel_->execute_parallel(host_list, flops_amount, bytes_amount, rate);
+ Action* res = hostModel_->execute_parallel(host_list, flops_amount, bytes_amount, rate);
static_cast<L07Action*>(res)->free_arrays_ = true;
return res;
}
-kernel::resource::CpuImpl* CpuL07Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
+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)
+StandardLinkImpl* 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], get_maxmin_system()))->set_model(this);
+ 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)
+StandardLinkImpl* NetworkL07Model::create_wifi_link(const std::string& name, const std::vector<double>& bandwidths)
{
THROW_UNIMPLEMENTED;
}
* Resource *
************/
-kernel::resource::CpuAction* CpuL07::execution_start(double size)
+CpuAction* CpuL07::execution_start(double size, double user_bound)
{
std::vector<s4u::Host*> host_list = {get_iface()};
+ xbt_assert(user_bound <= 0, "User bound not supported by ptask model");
auto* flops_amount = new double[host_list.size()]();
flops_amount[0] = size;
- kernel::resource::CpuAction* res =
+ CpuAction* res =
static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(host_list, flops_amount, nullptr, -1);
static_cast<L07Action*>(res)->free_arrays_ = true;
return res;
}
-kernel::resource::CpuAction* CpuL07::sleep(double duration)
+CpuAction* CpuL07::sleep(double duration)
{
- auto* action = static_cast<L07Action*>(execution_start(1.0));
+ auto* action = static_cast<L07Action*>(execution_start(1.0, -1));
action->set_max_duration(duration);
- action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
+ action->set_suspend_state(Action::SuspendStates::SLEEPING);
get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0);
return action;
}
-bool CpuL07::is_used() const
-{
- return get_model()->get_maxmin_system()->constraint_used(get_constraint());
-}
-
/** @brief take into account changes of speed (either load or max) */
void CpuL07::on_speed_change()
{
- const kernel::lmm::Element* elem = nullptr;
+ const lmm::Element* elem = nullptr;
- get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale);
- while (const auto* var = get_constraint()->get_variable(&elem)) {
- const kernel::resource::Action* action = var->get_id();
+ get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_core_count() * speed_.peak * speed_.scale);
- get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak);
+ while (const auto* var = get_constraint()->get_variable(&elem)) {
+ auto* action = static_cast<L07Action*>(var->get_id());
+ action->updateBound();
}
CpuImpl::on_speed_change();
}
-LinkL07::LinkL07(const std::string& name, double bandwidth, kernel::lmm::System* system) : LinkImpl(name)
+LinkL07::LinkL07(const std::string& name, double bandwidth, lmm::System* system) : StandardLinkImpl(name)
{
this->set_constraint(system->constraint_new(this, bandwidth));
bandwidth_.peak = bandwidth;
}
-bool LinkL07::is_used() const
-{
- return get_model()->get_maxmin_system()->constraint_used(get_constraint());
-}
-
-void CpuL07::apply_event(kernel::profile::Event* triggered, double value)
+void CpuL07::apply_event(profile::Event* triggered, double value)
{
XBT_DEBUG("Updating cpu %s (%p) with value %g", get_cname(), this, value);
if (triggered == speed_.event) {
on_speed_change();
tmgr_trace_event_unref(&speed_.event);
- } else if (triggered == state_event_) {
+ } else if (triggered == get_state_event()) {
if (value > 0) {
if (not is_on()) {
XBT_VERB("Restart actors on host %s", get_iface()->get_cname());
}
} else
get_iface()->turn_off();
- tmgr_trace_event_unref(&state_event_);
+ unref_state_event();
} else {
xbt_die("Unknown event!\n");
}
}
-void LinkL07::apply_event(kernel::profile::Event* triggered, double value)
+void LinkL07::apply_event(profile::Event* triggered, double value)
{
XBT_DEBUG("Updating link %s (%p) with value=%f", get_cname(), this, value);
if (triggered == bandwidth_.event) {
set_latency(value);
tmgr_trace_event_unref(&latency_.event);
- } else if (triggered == state_event_) {
+ } else if (triggered == get_state_event()) {
if (value > 0)
turn_on();
else
turn_off();
- tmgr_trace_event_unref(&state_event_);
-
+ unref_state_event();
} else {
xbt_die("Unknown event ! \n");
}
void LinkL07::set_bandwidth(double value)
{
bandwidth_.peak = value;
- LinkImpl::on_bandwidth_change();
+ StandardLinkImpl::on_bandwidth_change();
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::Element* elem = nullptr;
+ const lmm::Element* elem = nullptr;
latency_.peak = value;
while (const auto* var = get_constraint()->get_variable(&elem)) {
auto* action = static_cast<L07Action*>(var->get_id());
action->updateBound();
}
- return this;
}
LinkL07::~LinkL07() = default;
}
}
-void L07Action::updateBound()
+double L07Action::calculateNetworkBound()
{
double lat_current = 0.0;
+ double lat_bound = std::numeric_limits<double>::max();
size_t host_count = hostList_.size();
- if (communicationAmount_ != nullptr) {
- for (size_t i = 0; i < host_count; i++) {
- for (size_t j = 0; j < host_count; j++) {
- if (communicationAmount_[i * host_count + j] > 0) {
- double lat = 0.0;
- std::vector<kernel::resource::LinkImpl*> route;
- hostList_.at(i)->route_to(hostList_.at(j), route, &lat);
+ if (communicationAmount_ == nullptr) {
+ return lat_bound;
+ }
+
+ for (size_t i = 0; i < host_count; i++) {
+ for (size_t j = 0; j < host_count; j++) {
+ if (communicationAmount_[i * host_count + j] > 0) {
+ double lat = 0.0;
+ std::vector<StandardLinkImpl*> route;
+ hostList_.at(i)->route_to(hostList_.at(j), route, &lat);
- lat_current = std::max(lat_current, lat * communicationAmount_[i * host_count + j]);
- }
+ lat_current = std::max(lat_current, lat * communicationAmount_[i * host_count + j]);
}
}
}
- double lat_bound = kernel::resource::NetworkModel::cfg_tcp_gamma / (2.0 * lat_current);
- XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
- if ((latency_ <= 0.0) && is_running()) {
+ if (lat_current > 0) {
+ lat_bound = NetworkModel::cfg_tcp_gamma / (2.0 * lat_current);
+ }
+ return lat_bound;
+}
+
+double L07Action::calculateCpuBound()
+{
+ double cpu_bound = std::numeric_limits<double>::max();
+
+ if (computationAmount_ == nullptr) {
+ return cpu_bound;
+ }
+
+ for (size_t i = 0; i < hostList_.size(); i++) {
+ if (computationAmount_[i] > 0) {
+ cpu_bound = std::min(cpu_bound, hostList_[i]->get_cpu()->get_speed(1.0) *
+ hostList_[i]->get_cpu()->get_speed_ratio() / computationAmount_[i]);
+ }
+ }
+ return cpu_bound;
+}
+
+void L07Action::updateBound()
+{
+ double bound = std::min(calculateNetworkBound(), calculateCpuBound());
+
+ XBT_DEBUG("action (%p) : bound = %g", this, bound);
+
+ /* latency has been paid (or no latency), we can set the appropriate bound for multicore or network limit */
+ if ((bound < std::numeric_limits<double>::max()) && (latency_ <= 0.0)) {
if (rate_ < 0)
- get_model()->get_maxmin_system()->update_variable_bound(get_variable(), lat_bound);
+ get_model()->get_maxmin_system()->update_variable_bound(get_variable(), bound);
else
- get_model()->get_maxmin_system()->update_variable_bound(get_variable(), std::min(rate_, lat_bound));
+ get_model()->get_maxmin_system()->update_variable_bound(get_variable(), std::min(rate_, bound));
}
}
-} // namespace surf
+} // namespace resource
+} // namespace kernel
} // namespace simgrid
