X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79853b8925152a5b89d3f8f44d64ffaf284a0196..8adeec4061e3ee9bfee9a55378e883e25b2c6e9a:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index c960134bbf..c1750d7333 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team. +/* Copyright (c) 2007-2010, 2013-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,7 +12,6 @@ #include "ptask_L07.hpp" #include "cpu_interface.hpp" -#include "xbt/lib.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); @@ -41,7 +40,7 @@ HostL07Model::HostL07Model() : HostModel() { surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_); } -HostL07Model::~HostL07Model() +HostL07Model::~HostL07Model() { lmm_system_free(maxminSystem_); maxminSystem_ = nullptr; @@ -188,7 +187,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat); latency = MAX(latency, lat); - for (auto link : route) + for (auto const& link : route) affected_links.insert(link->cname()); } } @@ -217,7 +216,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, std::vector route; hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr); - for (auto link : route) + for (auto const& link : route) lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(), bytes_amount[i * host_nb + j]); } @@ -250,7 +249,7 @@ Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *spee return new CpuL07(this, host, speedPerPstate, core); } -LinkImpl* NetworkL07Model::createLink(const char* name, double bandwidth, double latency, +LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) { return new LinkL07(this, name, bandwidth, latency, policy); @@ -268,7 +267,7 @@ CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector CpuL07::~CpuL07()=default; -LinkL07::LinkL07(NetworkL07Model* model, const char* name, double bandwidth, double latency, +LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) : LinkImpl(model, name, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth)) {