From bde09a7b53c62986d6f22b10de50dec039b4f96a Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 23 Dec 2019 22:24:24 +0100 Subject: [PATCH] [sonar] Constify pointer and reference local variables in src/surf/. --- src/surf/cpu_cas01.cpp | 6 +++--- src/surf/network_cm02.cpp | 4 ++-- src/surf/network_ib.cpp | 6 +++--- src/surf/network_interface.cpp | 2 +- src/surf/ptask_L07.cpp | 12 ++++++------ src/surf/sg_platf.cpp | 12 ++++++------ src/surf/storage_n11.cpp | 4 ++-- src/surf/surf_interface.cpp | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index e9474159c1..48ba787984 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -102,7 +102,7 @@ bool CpuCas01::is_used() /** @brief take into account changes of speed (either load or max) */ void CpuCas01::on_speed_change() { - lmm::Variable* var = nullptr; + const lmm::Variable* var; const lmm::Element* elem = nullptr; get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), @@ -137,8 +137,8 @@ void CpuCas01::apply_event(profile::Event* event, double value) get_host()->turn_on(); } } else { - lmm::Constraint* cnst = get_constraint(); - lmm::Variable* var = nullptr; + const lmm::Constraint* cnst = get_constraint(); + const lmm::Variable* var; const lmm::Element* elem = nullptr; double date = surf_get_clock(); diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 0a8719814a..d9e3a7e44e 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -345,7 +345,7 @@ void NetworkCm02Link::set_bandwidth(double value) if (sg_weight_S_parameter > 0) { double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); - kernel::lmm::Variable* var; + const kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; @@ -361,7 +361,7 @@ void NetworkCm02Link::set_bandwidth(double value) void NetworkCm02Link::set_latency(double value) { double delta = value - latency_.peak; - kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index 1e62ea1cf4..1fba58db12 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -94,19 +94,19 @@ NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() try { Be = std::stod(radical_elements.front()); - } catch (std::invalid_argument& ia) { + } catch (const std::invalid_argument& ia) { throw std::invalid_argument(std::string("First part of smpi/IB-penalty-factors is not numerical:") + ia.what()); } try { Bs = std::stod(radical_elements.at(1)); - } catch (std::invalid_argument& ia) { + } catch (const std::invalid_argument& ia) { throw std::invalid_argument(std::string("Second part of smpi/IB-penalty-factors is not numerical:") + ia.what()); } try { ys = std::stod(radical_elements.back()); - } catch (std::invalid_argument& ia) { + } catch (const std::invalid_argument& ia) { throw std::invalid_argument(std::string("Third part of smpi/IB-penalty-factors is not numerical:") + ia.what()); } } diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index a2c886abde..fb8c73113b 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -138,7 +138,7 @@ void LinkImpl::turn_off() Resource::turn_off(); s4u::Link::on_state_change(this->piface_); - kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; double now = surf_get_clock(); while ((var = get_constraint()->get_variable(&elem))) { diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index b1cac899e8..cf22248877 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -119,10 +119,10 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) /* Need to check that none of the model has failed */ int i = 0; - kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i); + const kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i); while (cnst != nullptr) { i++; - kernel::resource::Resource* constraint_id = cnst->get_id(); + const kernel::resource::Resource* constraint_id = cnst->get_id(); if (not constraint_id->is_on()) { XBT_DEBUG("Action (%p) Failed!!", &action); action.finish(kernel::resource::Action::State::FAILED); @@ -210,7 +210,7 @@ L07Action::L07Action(kernel::resource::Model* model, const std::vector host_list = {src, dst}; - double* flops_amount = new double[2](); + const double* flops_amount = new double[2](); double* bytes_amount = new double[4](); bytes_amount[1] = size; @@ -288,12 +288,12 @@ bool CpuL07::is_used() /** @brief take into account changes of speed (either load or max) */ void CpuL07::on_speed_change() { - kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Variable* var; 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::resource::Action* action = static_cast(var->get_id()); + const kernel::resource::Action* action = static_cast(var->get_id()); get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } @@ -362,7 +362,7 @@ void LinkL07::set_bandwidth(double value) void LinkL07::set_latency(double value) { - kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Variable* var; L07Action *action; const kernel::lmm::Element* elem = nullptr; diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index c4f452e26a..6247def36c 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -218,8 +218,8 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster // other columns are to store one or more link for the node //add a loopback link - simgrid::s4u::Link* linkUp = nullptr; - simgrid::s4u::Link* linkDown = nullptr; + const simgrid::s4u::Link* linkUp = nullptr; + const simgrid::s4u::Link* linkDown = nullptr; if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ std::string tmp_link = link_id + "_loopback"; XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw); @@ -352,7 +352,7 @@ void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(), "Refusing to add a second storage named \"%s\"", storage->id.c_str()); - simgrid::kernel::resource::StorageType* stype; + const simgrid::kernel::resource::StorageType* stype; auto st = storage_types.find(storage->type_id); if (st != storage_types.end()) { stype = st->second; @@ -446,7 +446,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) } xbt_die("%s", msg.c_str()); } - simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(actor->function); + const simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(actor->function); xbt_assert(factory, "Error while creating an actor from the XML file: Function '%s' not registered", actor->function); double start_time = actor->start_time; @@ -671,8 +671,8 @@ void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostl xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get a host_link."); - simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); - simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down); + const simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); + const simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down); xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 90a77b4046..5293953422 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -21,7 +21,7 @@ extern std::map storage_ty void check_disk_attachment() { for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) { - simgrid::kernel::routing::NetPoint* host_elm = + const simgrid::kernel::routing::NetPoint* host_elm = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(s->get_impl()->get_host()); if (not host_elm) surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " + @@ -52,7 +52,7 @@ StorageN11Model::StorageN11Model() StorageImpl* StorageN11Model::createStorage(const std::string& id, const std::string& type_id, const std::string& content_name, const std::string& attach) { - StorageType* storage_type = storage_types.at(type_id); + const StorageType* storage_type = storage_types.at(type_id); double Bread = surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(), "property Bread, storage", type_id); diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 134ba2de62..18620ac064 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -231,7 +231,7 @@ void surf_exit() { simgrid::s4u::Engine::shutdown(); for (auto const& e : storage_types) { - simgrid::kernel::resource::StorageType* stype = e.second; + const simgrid::kernel::resource::StorageType* stype = e.second; delete stype->properties; delete stype->model_properties; delete stype; -- 2.20.1