/* 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);
: 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 (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 (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)
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)
+ if (policy == s4u::Link::SharingPolicy::FATPIPE)
get_constraint()->unshare();
s4u::Link::onCreation(this->piface_);
/** @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;
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale);
while ((var = get_constraint()->get_variable(&elem))) {
{
kernel::lmm::Variable* var = nullptr;
L07Action *action;
- const_lmm_element_t elem = nullptr;
+ const kernel::lmm::Element* elem = nullptr;
latency_.peak = value;
while ((var = get_constraint()->get_variable(&elem))) {
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)