X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ea1a3dca97a66f81466333806853c97af7eb398..8de466d0f03f18b22c6c36170b509d48a39fcd52:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 2a348a9429..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); @@ -46,7 +47,8 @@ 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) { set_maxmin_system(sys); } @@ -56,7 +58,8 @@ CpuL07Model::~CpuL07Model() 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) { set_maxmin_system(sys); loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); @@ -123,7 +126,7 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) 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; @@ -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()); } } } @@ -187,7 +190,7 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos model->get_maxmin_system()->update_variable_weight(get_variable(), 0.0); for (int i = 0; i < host_nb; i++) - model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->constraint(), get_variable(), 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,7 +200,7 @@ 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->get_maxmin_system()->expand_add(link->constraint(), this->get_variable(), + model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(), bytes_amount[i * host_nb + j]); } } @@ -254,7 +257,7 @@ LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwid 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_->execute_parallel(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,26 +278,26 @@ 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()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); return action; } bool CpuL07::is_used() { - return model()->get_maxmin_system()->constraint_used(constraint()); + 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()->get_maxmin_system()->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()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } Cpu::onSpeedChange(); @@ -302,12 +305,12 @@ void CpuL07::onSpeedChange() { bool LinkL07::is_used() { - return model()->get_maxmin_system()->constraint_used(constraint()); + 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(); @@ -315,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 { @@ -327,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); @@ -338,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 { @@ -351,17 +354,17 @@ void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) void LinkL07::setBandwidth(double value) { bandwidth_.peak = value; - model()->get_maxmin_system()->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(); } @@ -398,7 +401,7 @@ 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)