X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e7d79b763a5f55d1afb579d2b5a8d30ccfe869c..8de466d0f03f18b22c6c36170b509d48a39fcd52:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index a613ff30d6..0454e7a340 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -11,6 +11,7 @@ #include "ptask_L07.hpp" #include "cpu_interface.hpp" +#include "xbt/config.hpp" #include "xbt/utility.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); @@ -34,10 +35,10 @@ namespace simgrid { namespace surf { HostL07Model::HostL07Model() : HostModel() { - maxmin_system_ = new simgrid::kernel::lmm::System(true /* selective update */); - maxmin_system_->solve_fun = &simgrid::kernel::lmm::bottleneck_solve; - surf_network_model = new NetworkL07Model(this, maxmin_system_); - surf_cpu_model_pm = new CpuL07Model(this, maxmin_system_); + 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() @@ -46,31 +47,33 @@ HostL07Model::~HostL07Model() delete surf_cpu_model_pm; } -CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : CpuModel(), hostModel_(hmodel) +CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) + : CpuModel(Model::UpdateAlgo::Full), hostModel_(hmodel) { - maxmin_system_ = sys; + set_maxmin_system(sys); } CpuL07Model::~CpuL07Model() { - maxmin_system_ = nullptr; + set_maxmin_system(nullptr); } -NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : NetworkModel(), hostModel_(hmodel) +NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) + : NetworkModel(Model::UpdateAlgo::Full), hostModel_(hmodel) { - maxmin_system_ = sys; + set_maxmin_system(sys); loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); } NetworkL07Model::~NetworkL07Model() { - maxmin_system_ = nullptr; + set_maxmin_system(nullptr); } -double HostL07Model::nextOccuringEvent(double now) +double HostL07Model::next_occuring_event(double now) { - double min = HostModel::nextOccuringEventFull(now); - for (kernel::resource::Action const& action : *getRunningActionSet()) { + double min = HostModel::next_occuring_event_full(now); + for (kernel::resource::Action const& action : *get_running_action_set()) { const L07Action& net_action = static_cast(action); if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min)) { min = net_action.latency_; @@ -82,9 +85,9 @@ double HostL07Model::nextOccuringEvent(double now) return min; } -void HostL07Model::updateActionsState(double /*now*/, double delta) +void HostL07Model::update_actions_state(double /*now*/, double delta) { - for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { L07Action& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it if (action.latency_ > 0) { @@ -93,14 +96,14 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) } else { action.latency_ = 0.0; } - if ((action.latency_ <= 0.0) && (action.isSuspended() == 0)) { + if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) { action.updateBound(); - maxmin_system_->update_variable_weight(action.getVariable(), 1.0); + get_maxmin_system()->update_variable_weight(action.get_variable(), 1.0); } } XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(), - action.getVariable()->get_value() * delta); - action.update_remains(action.getVariable()->get_value() * delta); + action.get_variable()->get_value() * delta); + action.update_remains(action.get_variable()->get_value() * delta); if (action.get_max_duration() > NO_MAX_DURATION) action.update_max_duration(delta); @@ -113,29 +116,29 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) * If it's not done, it may have failed. */ - if (((action.get_remains() <= 0) && (action.getVariable()->get_weight() > 0)) || + if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { action.finish(kernel::resource::Action::State::done); } else { /* Need to check that none of the model has failed */ int i = 0; - kernel::lmm::Constraint* cnst = action.getVariable()->get_constraint(i); + kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i); while (cnst != nullptr) { i++; void* constraint_id = cnst->get_id(); - if (static_cast(constraint_id)->isOff()) { + if (static_cast(constraint_id)->is_off()) { XBT_DEBUG("Action (%p) Failed!!", &action); action.finish(kernel::resource::Action::State::failed); break; } - cnst = action.getVariable()->get_constraint(i); + cnst = action.get_variable()->get_constraint(i); } } } } -kernel::resource::Action* HostL07Model::executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, - double* bytes_amount, double rate) +kernel::resource::Action* HostL07Model::execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount, + double* bytes_amount, double rate) { return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate); } @@ -170,7 +173,7 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos latency = std::max(latency, lat); for (auto const& link : route) - affected_links.insert(link->getCname()); + affected_links.insert(link->get_cname()); } } } @@ -181,13 +184,13 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link); latency_ = latency; - setVariable(model->getMaxminSystem()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link)); + set_variable(model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link)); if (latency_ > 0) - model->getMaxminSystem()->update_variable_weight(getVariable(), 0.0); + model->get_maxmin_system()->update_variable_weight(get_variable(), 0.0); for (int i = 0; i < host_nb; i++) - model->getMaxminSystem()->expand(host_list[i]->pimpl_cpu->constraint(), getVariable(), flops_amount[i]); + model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(), flops_amount[i]); if(bytes_amount != nullptr) { for (int i = 0; i < host_nb; i++) { @@ -197,8 +200,8 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos hostList_->at(i)->routeTo(hostList_->at(j), route, nullptr); for (auto const& link : route) - model->getMaxminSystem()->expand_add(link->constraint(), this->getVariable(), - bytes_amount[i * host_nb + j]); + model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(), + bytes_amount[i * host_nb + j]); } } } @@ -221,7 +224,7 @@ kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host host_list[1] = dst; bytes_amount[1] = size; - return hostModel_->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); + return hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate); } Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) @@ -240,7 +243,7 @@ LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, ************/ CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Cpu(model, host, model->getMaxminSystem()->constraint_new(this, speedPerPstate->front()), speedPerPstate, core) + : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speedPerPstate->front()), speedPerPstate, core) { } @@ -248,13 +251,13 @@ CpuL07::~CpuL07()=default; LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) - : LinkImpl(model, name, model->getMaxminSystem()->constraint_new(this, bandwidth)) + : LinkImpl(model, name, model->get_maxmin_system()->constraint_new(this, bandwidth)) { bandwidth_.peak = bandwidth; latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - constraint()->unshare(); + get_constraint()->unshare(); s4u::Link::onCreation(this->piface_); } @@ -267,7 +270,7 @@ kernel::resource::Action* CpuL07::execution_start(double size) host_list[0] = getHost(); flops_amount[0] = size; - return static_cast(model())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1); + return static_cast(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1); } kernel::resource::Action* CpuL07::sleep(double duration) @@ -275,38 +278,39 @@ kernel::resource::Action* CpuL07::sleep(double duration) L07Action *action = static_cast(execution_start(1.0)); action->set_max_duration(duration); action->suspended_ = kernel::resource::Action::SuspendStates::sleeping; - model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0); + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); return action; } -bool CpuL07::isUsed(){ - return model()->getMaxminSystem()->constraint_used(constraint()); +bool CpuL07::is_used() +{ + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } /** @brief take into account changes of speed (either load or max) */ void CpuL07::onSpeedChange() { kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; - model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale); - while ((var = constraint()->get_variable(&elem))) { + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale); + while ((var = get_constraint()->get_variable(&elem))) { kernel::resource::Action* action = static_cast(var->get_id()); - model()->getMaxminSystem()->update_variable_bound(action->getVariable(), speed_.scale * speed_.peak); + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } Cpu::onSpeedChange(); } - -bool LinkL07::isUsed(){ - return model()->getMaxminSystem()->constraint_used(constraint()); +bool LinkL07::is_used() +{ + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) { - XBT_DEBUG("Updating cpu %s (%p) with value %g", getCname(), this, value); + XBT_DEBUG("Updating cpu %s (%p) with value %g", get_cname(), this, value); if (triggered == speed_.event) { speed_.scale = value; onSpeedChange(); @@ -314,9 +318,9 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) } else if (triggered == stateEvent_) { if (value > 0) - turnOn(); + turn_on(); else - turnOff(); + turn_off(); tmgr_trace_event_unref(&stateEvent_); } else { @@ -326,7 +330,7 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) { - XBT_DEBUG("Updating link %s (%p) with value=%f", getCname(), this, value); + XBT_DEBUG("Updating link %s (%p) with value=%f", get_cname(), this, value); if (triggered == bandwidth_.event) { setBandwidth(value); tmgr_trace_event_unref(&bandwidth_.event); @@ -337,9 +341,9 @@ void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) } else if (triggered == stateEvent_) { if (value > 0) - turnOn(); + turn_on(); else - turnOff(); + turn_off(); tmgr_trace_event_unref(&stateEvent_); } else { @@ -350,17 +354,17 @@ void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) void LinkL07::setBandwidth(double value) { bandwidth_.peak = value; - model()->getMaxminSystem()->update_constraint_bound(constraint(), bandwidth_.peak * bandwidth_.scale); + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), bandwidth_.peak * bandwidth_.scale); } void LinkL07::setLatency(double value) { kernel::lmm::Variable* var = nullptr; L07Action *action; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; latency_.peak = value; - while ((var = constraint()->get_variable(&elem))) { + while ((var = get_constraint()->get_variable(&elem))) { action = static_cast(var->get_id()); action->updateBound(); } @@ -397,28 +401,14 @@ void L07Action::updateBound() } } } - double lat_bound = sg_tcp_gamma / (2.0 * lat_current); + double lat_bound = NetworkModel::cfg_tcp_gamma / (2.0 * lat_current); XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound); if ((latency_ <= 0.0) && (suspended_ == Action::SuspendStates::not_suspended)) { if (rate_ < 0) - get_model()->getMaxminSystem()->update_variable_bound(getVariable(), lat_bound); + get_model()->get_maxmin_system()->update_variable_bound(get_variable(), lat_bound); else - get_model()->getMaxminSystem()->update_variable_bound(getVariable(), std::min(rate_, lat_bound)); - } -} - -int L07Action::unref() -{ - refcount_--; - if (not refcount_) { - if (state_set_hook_.is_linked()) - simgrid::xbt::intrusive_erase(*state_set_, *this); - if (getVariable()) - get_model()->getMaxminSystem()->variable_free(getVariable()); - delete this; - return 1; + get_model()->get_maxmin_system()->update_variable_bound(get_variable(), std::min(rate_, lat_bound)); } - return 0; } }