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() = default;
, hostModel_(hmodel)
{
maxminSystem_ = sys;
+ loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
}
NetworkL07Model::~NetworkL07Model()
{
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) {
if (bytes_amount[i * host_nb + j] > 0) {
double lat=0.0;
- std::vector<Link*> route;
- 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)
if (bytes_amount[i * host_nb + j] == 0.0)
continue;
- std::vector<Link*> route;
- 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)
lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), this->getVariable(), bytes_amount[i * host_nb + j]);
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);
}
/************
CpuL07::~CpuL07()=default;
-LinkL07::LinkL07(NetworkL07Model* model, const char* name, xbt_dict_t props, double bandwidth, double latency,
+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), props)
+ : Link(model, name, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth))
{
bandwidth_.peak = bandwidth;
latency_.peak = latency;
**********/
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;
- routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], &route, &lat);
+ hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
lat_current = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]);
}