#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
+#include "xbt/config.hpp"
#include "xbt/utility.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
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()
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::next_occuring_event(double now)
}
if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) {
action.updateBound();
- maxmin_system_->update_variable_weight(action.get_variable(), 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(),
while (cnst != nullptr) {
i++;
void* constraint_id = cnst->get_id();
- if (static_cast<simgrid::kernel::resource::Resource*>(constraint_id)->isOff()) {
+ if (static_cast<simgrid::kernel::resource::Resource*>(constraint_id)->is_off()) {
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(kernel::resource::Action::State::failed);
break;
}
}
-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);
}
latency = std::max(latency, lat);
for (auto const& link : route)
- affected_links.insert(link->getCname());
+ affected_links.insert(link->get_cname());
}
}
}
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++) {
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]);
}
}
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<double> *speedPerPstate, int core)
latency_.peak = latency;
if (policy == SURF_LINK_FATPIPE)
- constraint()->unshare();
+ get_constraint()->unshare();
s4u::Link::onCreation(this->piface_);
}
host_list[0] = getHost();
flops_amount[0] = size;
- return static_cast<CpuL07Model*>(model())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1);
+ return static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1);
}
kernel::resource::Action* CpuL07::sleep(double duration)
L07Action *action = static_cast<L07Action*>(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::isUsed(){
- return model()->get_maxmin_system()->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()->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<kernel::resource::Action*>(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();
}
-
-bool LinkL07::isUsed(){
- return model()->get_maxmin_system()->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();
} else if (triggered == stateEvent_) {
if (value > 0)
- turnOn();
+ turn_on();
else
- turnOff();
+ turn_off();
tmgr_trace_event_unref(&stateEvent_);
} else {
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);
} else if (triggered == stateEvent_) {
if (value > 0)
- turnOn();
+ turn_on();
else
- turnOff();
+ turn_off();
tmgr_trace_event_unref(&stateEvent_);
} else {
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<L07Action*>(var->get_id());
action->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)
