From d32cddf4087e9fe3fd8007773f4b247f21c8bef7 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 23 Dec 2019 23:53:17 +0100 Subject: [PATCH] [sonar] Constify pointer and reference local variables in src/instr/. --- src/instr/instr_config.cpp | 2 +- src/instr/instr_paje_events.cpp | 2 +- src/instr/instr_platform.cpp | 20 ++++++++++---------- src/instr/jedule/jedule_platform.cpp | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index a704abfe69..5e5ccd0fa7 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -149,7 +149,7 @@ static void TRACE_end() TRACE_last_timestamp_to_dump = surf_get_clock(); TRACE_paje_dump_buffer(true); - simgrid::instr::Type* root_type = simgrid::instr::Container::get_root()->type_; + const simgrid::instr::Type* root_type = simgrid::instr::Container::get_root()->type_; /* destroy all data structures of tracing (and free) */ delete simgrid::instr::Container::get_root(); delete root_type; diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp index e50eda202f..a1d0a0b3d9 100644 --- a/src/instr/instr_paje_events.cpp +++ b/src/instr/instr_paje_events.cpp @@ -40,7 +40,7 @@ StateEvent::StateEvent(Container* container, Type* type, e_event_type event_type { #if HAVE_SMPI if (simgrid::config::get_value("smpi/trace-call-location")) { - smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); + const smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); filename = loc->filename; linenumber = loc->linenumber; } diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index ef07fe1c01..dc634259c5 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -57,7 +57,7 @@ static container_t lowestCommonAncestor(container_t a1, container_t a2) int j = ancestors_a2.size() - 1; while (i >= 0 && j >= 0) { container_t a1p = ancestors_a1.at(i); - container_t a2p = ancestors_a2.at(j); + const simgrid::instr::Container* a2p = ancestors_a2.at(j); if (a1p == a2p) { p = a1p; } else { @@ -143,7 +143,7 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t netzone->get_impl()->get_graph(graph, nodes, edges); for (auto elm : *edges) { - xbt_edge_t edge = elm.second; + const xbt_edge* edge = elm.second; linkContainers(simgrid::instr::Container::by_name(static_cast(edge->src->data)), simgrid::instr::Container::by_name(static_cast(edge->dst->data)), filter); } @@ -207,8 +207,8 @@ static void instr_link_on_creation(simgrid::s4u::Link const& link) static void instr_host_on_creation(simgrid::s4u::Host const& host) { - container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); - container_t root = simgrid::instr::Container::get_root(); + simgrid::instr::Container* container = new simgrid::instr::HostContainer(host, currentContainer.back()); + const simgrid::instr::Container* root = simgrid::instr::Container::get_root(); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) { simgrid::instr::VariableType* speed = container->type_->by_name_or_create("speed", ""); @@ -248,13 +248,13 @@ static void instr_action_on_state_change(simgrid::kernel::resource::Action const double value = action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i); /* Beware of composite actions: ptasks put links and cpus together. Extra pb: we cannot dynamic_cast from void* */ simgrid::kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id(); - simgrid::kernel::resource::Cpu* cpu = dynamic_cast(resource); + const simgrid::kernel::resource::Cpu* cpu = dynamic_cast(resource); if (cpu != nullptr) TRACE_surf_resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value, action.get_last_update(), SIMIX_get_clock() - action.get_last_update()); - simgrid::kernel::resource::LinkImpl* link = dynamic_cast(resource); + const simgrid::kernel::resource::LinkImpl* link = dynamic_cast(resource); if (link != nullptr) TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action.get_category(), value, @@ -289,8 +289,8 @@ static void instr_on_platform_created() static void instr_actor_on_creation(simgrid::s4u::Actor const& actor) { - container_t root = simgrid::instr::Container::get_root(); - container_t container = simgrid::instr::Container::by_name(actor.get_host()->get_name()); + const simgrid::instr::Container* root = simgrid::instr::Container::get_root(); + simgrid::instr::Container* container = simgrid::instr::Container::by_name(actor.get_host()->get_name()); container->create_child(instr_pid(actor), "ACTOR"); simgrid::instr::ContainerType* actor_type = @@ -332,8 +332,8 @@ static void instr_actor_on_host_change(simgrid::s4u::Actor const& actor, static void instr_vm_on_creation(simgrid::s4u::Host const& host) { - container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); - container_t root = simgrid::instr::Container::get_root(); + const simgrid::instr::Container* container = new simgrid::instr::HostContainer(host, currentContainer.back()); + const simgrid::instr::Container* root = simgrid::instr::Container::get_root(); simgrid::instr::ContainerType* vm = container->type_->by_name_or_create("VM"); simgrid::instr::StateType* state = vm->by_name_or_create("VM_STATE"); state->add_entity_value("suspend", "1 0 1"); diff --git a/src/instr/jedule/jedule_platform.cpp b/src/instr/jedule/jedule_platform.cpp index 3c6a59117c..668eee3083 100644 --- a/src/instr/jedule/jedule_platform.cpp +++ b/src/instr/jedule/jedule_platform.cpp @@ -201,7 +201,7 @@ void get_resource_selection_by_hosts(std::vector& subse std::unordered_map> parent2hostgroup; for (auto const& host : host_list) { const char *host_name = sg_host_get_name(host); - jed_container_t parent = host2_simgrid_parent_container.at(host_name); + const simgrid::jedule::Container* parent = host2_simgrid_parent_container.at(host_name); xbt_assert( parent != nullptr ); auto host_group = parent2hostgroup.find(parent->name.c_str()); -- 2.20.1