/* 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 <cstdlib>
-
-#include <algorithm>
-#include <unordered_set>
-
#include "ptask_L07.hpp"
+#include "surf/surf.hpp"
+#include "xbt/config.hpp"
-#include "cpu_interface.hpp"
-#include "xbt/utility.hpp"
+#include <unordered_set>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
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);
}
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);
+ loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
}
NetworkL07Model::~NetworkL07Model()
if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) {
action.updateBound();
get_maxmin_system()->update_variable_weight(action.get_variable(), 1.0);
+ action.set_last_update();
}
}
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;
if (bytes_amount[i * host_nb + j] > 0) {
double lat=0.0;
- std::vector<LinkImpl*> route;
+ std::vector<kernel::resource::LinkImpl*> route;
hostList_->at(i)->routeTo(hostList_->at(j), route, &lat);
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++) {
for (int j = 0; j < host_nb; j++) {
if (bytes_amount[i * host_nb + j] > 0.0) {
- std::vector<LinkImpl*> route;
+ std::vector<kernel::resource::LinkImpl*> route;
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]);
}
}
return new CpuL07(this, host, speedPerPstate, core);
}
-LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy)
+kernel::resource::LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency,
+ s4u::Link::SharingPolicy policy)
{
return new LinkL07(this, name, bandwidth, latency, policy);
}
CpuL07::~CpuL07()=default;
LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy)
+ s4u::Link::SharingPolicy policy)
: LinkImpl(model, name, model->get_maxmin_system()->constraint_new(this, bandwidth))
{
bandwidth_.peak = bandwidth;
latency_.peak = latency;
- if (policy == SURF_LINK_FATPIPE)
- constraint()->unshare();
+ if (policy == s4u::Link::SharingPolicy::FATPIPE)
+ get_constraint()->unshare();
- s4u::Link::onCreation(this->piface_);
+ s4u::Link::on_creation(this->piface_);
}
kernel::resource::Action* CpuL07::execution_start(double size)
host_list[0] = getHost();
flops_amount[0] = size;
- return static_cast<CpuL07Model*>(model())->hostModel_->execute_parallel(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::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<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::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();
} 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);
+ LinkImpl::on_bandwidth_change();
+
+ 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();
}
if (communicationAmount_[i * hostNb + j] > 0) {
double lat = 0.0;
- std::vector<LinkImpl*> route;
+ std::vector<kernel::resource::LinkImpl*> route;
hostList_->at(i)->routeTo(hostList_->at(j), route, &lat);
lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]);
}
}
}
- double lat_bound = sg_tcp_gamma / (2.0 * lat_current);
+ 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) && (suspended_ == Action::SuspendStates::not_suspended)) {
if (rate_ < 0)
