#include <cstdlib>
#include <algorithm>
+#include <unordered_set>
#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
-#include "surf_routing.hpp"
#include "xbt/lib.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
maxminSystem_->solve_fun = &bottleneck_solve;
surf_network_model = new NetworkL07Model(this,maxminSystem_);
surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
-
- routing_model_create(surf_network_model->createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, nullptr));
}
-HostL07Model::~HostL07Model() {
- delete surf_cpu_model_pm;
- delete surf_network_model;
-}
+HostL07Model::~HostL07Model() = default;
CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
: CpuModel()
maxminSystem_ = sys;
}
CpuL07Model::~CpuL07Model() {
- surf_cpu_model_pm = nullptr;
lmm_system_free(maxminSystem_);
maxminSystem_ = nullptr;
}
, hostModel_(hmodel)
{
maxminSystem_ = sys;
+ loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
}
NetworkL07Model::~NetworkL07Model()
{
- surf_network_model = nullptr;
maxminSystem_ = nullptr; // Avoid multi-free
}
}
}
}
- return;
}
Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list,
return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate);
}
-
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
double *flops_amount, double *bytes_amount, double rate)
: CpuAction(model, 1, 0)
+ , computationAmount_(flops_amount)
+ , communicationAmount_(bytes_amount)
+ , rate_(rate)
{
int nb_link = 0;
int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */
double latency = 0.0;
- this->netcardList_->reserve(host_nb);
+ this->hostList_->reserve(host_nb);
for (int i = 0; i<host_nb; i++)
- this->netcardList_->push_back(host_list[i]->pimpl_netcard);
+ this->hostList_->push_back(host_list[i]);
/* Compute the number of affected resources... */
if(bytes_amount != nullptr) {
- xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(nullptr);
+ std::unordered_set<const char*> affected_links;
for (int i = 0; i < host_nb; i++) {
for (int j = 0; j < host_nb; j++) {
if (bytes_amount[i * host_nb + j] > 0) {
double lat=0.0;
- std::vector<Link*> *route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], route, &lat);
+ std::vector<Link*> route;
+ hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
latency = MAX(latency, lat);
- for (auto link : *route)
- xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, nullptr);
- delete route;
+ for (auto link : route)
+ affected_links.insert(link->getName());
}
}
}
- nb_link = xbt_dict_length(ptask_parallel_task_link_set);
- xbt_dict_free(&ptask_parallel_task_link_set);
+ nb_link = affected_links.size();
}
for (int i = 0; i < host_nb; i++)
nb_used_host++;
XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link);
- this->computationAmount_ = flops_amount;
- this->communicationAmount_ = bytes_amount;
this->latency_ = latency;
- this->rate_ = rate;
this->variable_ = lmm_variable_new(model->getMaxminSystem(), this, 1.0,
(rate > 0 ? rate : -1.0),
if (bytes_amount[i * host_nb + j] == 0.0)
continue;
- std::vector<Link*> *route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], route, nullptr);
+ std::vector<Link*> route;
+ hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr);
- for (auto link : *route)
+ for (auto link : route)
lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), this->getVariable(), bytes_amount[i * host_nb + j]);
-
- delete route;
}
}
}
xbt_free(host_list);
}
-Action *NetworkL07Model::communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate)
+Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
sg_host_t*host_list = xbt_new0(sg_host_t, 2);
double *flops_amount = xbt_new0(double, 2);
double *bytes_amount = xbt_new0(double, 4);
- host_list[0] = sg_host_by_name(src->name());
- host_list[1] = sg_host_by_name(dst->name());
+ host_list[0] = src;
+ host_list[1] = dst;
bytes_amount[1] = size;
return hostModel_->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate);
return new CpuL07(this, host, speedPerPstate, core);
}
-Link* NetworkL07Model::createLink(const char *name, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy, xbt_dict_t properties)
+Link* NetworkL07Model::createLink(const char* name, double bandwidth, double latency,
+ e_surf_link_sharing_policy_t policy)
{
- return new LinkL07(this, name, properties, bandwidth, latency, policy);
+ return new LinkL07(this, name, bandwidth, latency, policy);
}
/************
* Resource *
************/
-CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)
- : Cpu(model, host, speedPerPstate, core)
+CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector<double>* speedPerPstate, int core)
+ : Cpu(model, host, lmm_constraint_new(model->getMaxminSystem(), this, speedPerPstate->front()), speedPerPstate,
+ core)
{
- constraint_ = lmm_constraint_new(model->getMaxminSystem(), this, speedPerPstate->front());
}
CpuL07::~CpuL07()=default;
-LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy)
- : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth))
+LinkL07::LinkL07(NetworkL07Model* model, const char* name, double bandwidth, double latency,
+ e_surf_link_sharing_policy_t policy)
+ : Link(model, name, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth))
{
- m_bandwidth.peak = bandwidth;
- m_latency.peak = latency;
+ bandwidth_.peak = bandwidth;
+ latency_.peak = latency;
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(getConstraint());
void LinkL07::apply_event(tmgr_trace_iterator_t triggered, double value) {
XBT_DEBUG("Updating link %s (%p) with value=%f", getName(), this, value);
- if (triggered == m_bandwidth.event) {
- updateBandwidth(value);
- tmgr_trace_event_unref(&m_bandwidth.event);
+ if (triggered == bandwidth_.event) {
+ setBandwidth(value);
+ tmgr_trace_event_unref(&bandwidth_.event);
- } else if (triggered == m_latency.event) {
- updateLatency(value);
- tmgr_trace_event_unref(&m_latency.event);
+ } else if (triggered == latency_.event) {
+ setLatency(value);
+ tmgr_trace_event_unref(&latency_.event);
- } else if (triggered == m_stateEvent) {
+ } else if (triggered == stateEvent_) {
if (value > 0)
turnOn();
else
turnOff();
- tmgr_trace_event_unref(&m_stateEvent);
+ tmgr_trace_event_unref(&stateEvent_);
} else {
xbt_die("Unknown event ! \n");
}
}
-void LinkL07::updateBandwidth(double value)
+void LinkL07::setBandwidth(double value)
{
- m_bandwidth.peak = value;
- lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_bandwidth.peak * m_bandwidth.scale);
+ bandwidth_.peak = value;
+ lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), bandwidth_.peak * bandwidth_.scale);
}
-void LinkL07::updateLatency(double value)
+void LinkL07::setLatency(double value)
{
lmm_variable_t var = nullptr;
L07Action *action;
lmm_element_t elem = nullptr;
- m_latency.peak = value;
+ latency_.peak = value;
while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) {
action = static_cast<L07Action*>(lmm_variable_id(var));
action->updateBound();
**********/
L07Action::~L07Action(){
- delete netcardList_;
+ delete hostList_;
free(communicationAmount_);
free(computationAmount_);
}
double lat_bound = -1.0;
int i, j;
- int hostNb = netcardList_->size();
+ int hostNb = hostList_->size();
if (communicationAmount_ != nullptr) {
for (i = 0; i < hostNb; i++) {
if (communicationAmount_[i * hostNb + j] > 0) {
double lat = 0.0;
- std::vector<Link*> *route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], route, &lat);
+ std::vector<Link*> route;
+ hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
lat_current = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]);
- delete route;
}
}
}
