From 68c4f3d5e544c5fe8e2a67a5607d7a268a0e59a1 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 4 Jun 2021 10:16:08 +0200 Subject: [PATCH] [sonar] Replace redundant type with 'auto'. --- src/instr/instr_interface.cpp | 4 ++-- src/mc/compare.cpp | 2 +- src/mc/sosp/Region.cpp | 4 ++-- src/s4u/s4u_Actor.cpp | 2 +- src/s4u/s4u_Host.cpp | 2 +- src/s4u/s4u_Link.cpp | 4 ++-- src/simdag/sd_task.cpp | 2 +- src/smpi/bindings/smpi_pmpi_topo.cpp | 17 ++++++++--------- src/smpi/mpi/smpi_comm.cpp | 2 +- src/xbt/dynar.cpp | 2 +- src/xbt/xbt_log_appender_file.cpp | 24 ++++++++++++------------ src/xbt/xbt_log_layout_format.cpp | 8 ++++---- src/xbt/xbt_log_layout_simple.cpp | 4 ++-- 13 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index bb63291955..98373815fb 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -175,7 +175,7 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar xbt_assert(mark_type, "mark_type is nullptr"); xbt_assert(mark_value, "mark_value is nullptr"); - simgrid::instr::EventType* type = + auto* type = static_cast(simgrid::instr::Container::get_root()->type_->by_name(mark_type)); if (not type) { throw simgrid::TracingError(XBT_THROW_POINT, @@ -230,7 +230,7 @@ void TRACE_mark(const char *mark_type, const char *mark_value) xbt_assert(mark_value, "mark_value is nullptr"); //check if mark_type is already declared - simgrid::instr::EventType* type = + auto* type = static_cast(simgrid::instr::Container::get_root()->type_->by_name(mark_type)); if (not type) { throw simgrid::TracingError(XBT_THROW_POINT, diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 47d39a5254..ce9121e914 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -239,7 +239,7 @@ static bool mmalloc_heap_differ(const RemoteProcess& process, StateComparator& s xbt_assert(heapinfo1->type >= 0, "Unknown mmalloc block type: %d", heapinfo1->type); - void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase)); + void* addr_block1 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ if (is_stack(process, addr_block1)) { diff --git a/src/mc/sosp/Region.cpp b/src/mc/sosp/Region.cpp index 6219b84ae7..48a7a4ea6a 100644 --- a/src/mc/sosp/Region.cpp +++ b/src/mc/sosp/Region.cpp @@ -37,7 +37,7 @@ void Region::restore() const xbt_assert(simgrid::mc::mmu::chunk_count(size()) == get_chunks().page_count()); for (size_t i = 0; i != get_chunks().page_count(); ++i) { - void* target_page = (void*)simgrid::mc::mmu::join(i, (std::uintptr_t)(void*)start().address()); + auto* target_page = (void*)simgrid::mc::mmu::join(i, (std::uintptr_t)(void*)start().address()); const void* source_page = get_chunks().page(i); mc_model_checker->get_remote_process().write_bytes(source_page, xbt_pagesize, remote(target_page)); } @@ -76,7 +76,7 @@ void* Region::read(void* target, const void* addr, std::size_t size) const // Read each page: while (simgrid::mc::mmu::split((std::uintptr_t)addr).first != page_end) { const void* snapshot_addr = mc_translate_address_region((uintptr_t)addr, this); - void* next_page = (void*)simgrid::mc::mmu::join(simgrid::mc::mmu::split((std::uintptr_t)addr).first + 1, 0); + auto* next_page = (void*)simgrid::mc::mmu::join(simgrid::mc::mmu::split((std::uintptr_t)addr).first + 1, 0); size_t readable = (char*)next_page - (const char*)addr; memcpy(dest, snapshot_addr, readable); addr = (const char*)addr + readable; diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 35b707050d..bb548f0739 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -490,7 +490,7 @@ sg_actor_t* sg_actor_list() xbt_assert(actor_count > 0, "There is no actor!"); std::vector actors = e->get_all_actors(); - sg_actor_t* res = xbt_new(sg_actor_t, actors.size()); + auto* res = xbt_new(sg_actor_t, actors.size()); for (size_t i = 0; i < actor_count; i++) res[i] = actors[i].get(); return res; diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 02684f98bd..9db61956a8 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -397,7 +397,7 @@ sg_host_t* sg_host_list() xbt_assert(host_count > 0, "There is no host!"); std::vector hosts = e->get_all_hosts(); - sg_host_t* res = xbt_new(sg_host_t, hosts.size()); + auto* res = xbt_new(sg_host_t, hosts.size()); std::copy(begin(hosts), end(hosts), res); return res; diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp index ba86b41b75..1a5db6cde0 100644 --- a/src/s4u/s4u_Link.cpp +++ b/src/s4u/s4u_Link.cpp @@ -273,8 +273,8 @@ sg_link_t* sg_link_list() { std::vector links = simgrid::s4u::Engine::get_instance()->get_all_links(); - sg_link_t* res = xbt_new(sg_link_t, links.size()); - memcpy(res, links.data(), sizeof(sg_link_t) * links.size()); + auto* res = xbt_new(sg_link_t, links.size()); + std::copy(begin(links), end(links), res); return res; } diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index 1c78fa2698..95831968d0 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -36,7 +36,7 @@ static void __SD_task_destroy_scheduling_data(SD_task_t task) */ SD_task_t SD_task_create(const char* name, void* data, double amount) { - SD_task_t task = xbt_new0(s_SD_task_t, 1); + auto* task = xbt_new0(s_SD_task_t, 1); task->kind = SD_TASK_NOT_TYPED; task->state = SD_NOT_SCHEDULED; sd_global->initial_tasks.insert(task); diff --git a/src/smpi/bindings/smpi_pmpi_topo.cpp b/src/smpi/bindings/smpi_pmpi_topo.cpp index 7f15585578..244c24b2fa 100644 --- a/src/smpi/bindings/smpi_pmpi_topo.cpp +++ b/src/smpi/bindings/smpi_pmpi_topo.cpp @@ -24,8 +24,7 @@ int PMPI_Cart_create(MPI_Comm comm, int ndims, const int* dims, const int* perio CHECK_NEGATIVE(2, MPI_ERR_ARG, ndims) for (int i = 0; i < ndims; i++) CHECK_NEGATIVE(2, MPI_ERR_ARG, dims[i]) - const simgrid::smpi::Topo_Cart* topo = - new simgrid::smpi::Topo_Cart(comm, ndims, dims, periodic, reorder, comm_cart); + const auto* topo = new simgrid::smpi::Topo_Cart(comm, ndims, dims, periodic, reorder, comm_cart); if (*comm_cart == MPI_COMM_NULL) { delete topo; } else { @@ -38,7 +37,7 @@ int PMPI_Cart_rank(MPI_Comm comm, const int* coords, int* rank) { CHECK_COMM(1) CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo()) CHECK_NULL(2, MPI_SUCCESS, coords) - MPIR_Cart_Topology topo = static_cast(comm->topo().get()); + auto* topo = static_cast(comm->topo().get()); if (topo==nullptr) { return MPI_ERR_ARG; } @@ -51,7 +50,7 @@ int PMPI_Cart_shift(MPI_Comm comm, int direction, int displ, int* source, int* d CHECK_NEGATIVE(3, MPI_ERR_ARG, direction) CHECK_NULL(4, MPI_ERR_ARG, source) CHECK_NULL(5, MPI_ERR_ARG, dest) - MPIR_Cart_Topology topo = static_cast(comm->topo().get()); + auto* topo = static_cast(comm->topo().get()); if (topo==nullptr) { return MPI_ERR_ARG; } @@ -66,7 +65,7 @@ int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) { if(maxdims==0 || coords == nullptr) { return MPI_SUCCESS; } - MPIR_Cart_Topology topo = static_cast(comm->topo().get()); + auto* topo = static_cast(comm->topo().get()); if (topo==nullptr) { return MPI_ERR_ARG; } @@ -80,7 +79,7 @@ int PMPI_Cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coor CHECK_COMM(1) CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo()) CHECK_NEGATIVE(3, MPI_ERR_ARG, maxdims) - MPIR_Cart_Topology topo = static_cast(comm->topo().get()); + auto* topo = static_cast(comm->topo().get()); if (topo==nullptr) { return MPI_ERR_ARG; } @@ -91,7 +90,7 @@ int PMPI_Cartdim_get(MPI_Comm comm, int* ndims) { CHECK_COMM(1) CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo()) CHECK_NULL(2, MPI_ERR_ARG, ndims) - const simgrid::smpi::Topo_Cart* topo = static_cast(comm->topo().get()); + const auto* topo = static_cast(comm->topo().get()); if (topo==nullptr) { return MPI_ERR_ARG; } @@ -110,11 +109,11 @@ int PMPI_Cart_sub(MPI_Comm comm, const int* remain_dims, MPI_Comm* comm_new) { CHECK_COMM(1) CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo()) CHECK_NULL(3, MPI_ERR_ARG, comm_new) - MPIR_Cart_Topology topo = static_cast(comm->topo().get()); + auto* topo = static_cast(comm->topo().get()); if (topo==nullptr) { return MPI_ERR_ARG; } - const simgrid::smpi::Topo_Cart* cart = topo->sub(remain_dims, comm_new); + const auto* cart = topo->sub(remain_dims, comm_new); if(*comm_new==MPI_COMM_NULL) delete cart; if(cart==nullptr) diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index 115b798de6..29598556e2 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -474,7 +474,7 @@ void Comm::init_smp(){ int my_local_size=comm_intra->size(); if(comm_intra->rank()==0) { int is_uniform = 1; - int* non_uniform_map = xbt_new0(int,leader_group_size); + auto* non_uniform_map = xbt_new0(int, leader_group_size); allgather__ring(&my_local_size, 1, MPI_INT, non_uniform_map, 1, MPI_INT, leader_comm); for(i=0; i < leader_group_size; i++) { diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp index b86765ac3f..2cf9593eb9 100644 --- a/src/xbt/dynar.cpp +++ b/src/xbt/dynar.cpp @@ -81,7 +81,7 @@ static inline void _xbt_dynar_get_elm(void* dst, const_xbt_dynar_t dynar, unsign */ xbt_dynar_t xbt_dynar_new(const unsigned long elmsize, void_f_pvoid_t free_f) { - xbt_dynar_t dynar = xbt_new0(s_xbt_dynar_t, 1); + auto* dynar = xbt_new0(s_xbt_dynar_t, 1); dynar->size = 0; dynar->used = 0; diff --git a/src/xbt/xbt_log_appender_file.cpp b/src/xbt/xbt_log_appender_file.cpp index faadee9f33..8247d29ee4 100644 --- a/src/xbt/xbt_log_appender_file.cpp +++ b/src/xbt/xbt_log_appender_file.cpp @@ -26,10 +26,10 @@ static void free_(const s_xbt_log_appender_t* this_) xbt_log_appender_t xbt_log_appender_stream(FILE* f) { - xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1); - res->do_append = &append_file; - res->free_ = nullptr; - res->data = static_cast(f); + auto* res = xbt_new0(s_xbt_log_appender_t, 1); + res->do_append = &append_file; + res->free_ = nullptr; + res->data = static_cast(f); return res; } @@ -37,10 +37,10 @@ xbt_log_appender_t xbt_log_appender_file_new(const char* arg) { if (arg == nullptr) return xbt_log_appender_stream(stderr); - xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1); - res->do_append = &append_file; - res->free_ = &free_; - res->data = static_cast(fopen(arg, "w")); + auto* res = xbt_new0(s_xbt_log_appender_t, 1); + res->do_append = &append_file; + res->free_ = &free_; + res->data = static_cast(fopen(arg, "w")); xbt_assert(res->data != nullptr, "Cannot open file: %s: %s", arg, strerror(errno)); return res; } @@ -113,10 +113,10 @@ static void free_append2_(const s_xbt_log_appender_t* this_) //For split, replace % in the file by the current count xbt_log_appender_t xbt_log_appender2_file_new(const char* arg, int roll) { - xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1); - res->do_append = &append2_file; - res->free_ = &free_append2_; - xbt_log_append2_file_t data = xbt_new0(struct xbt_log_append2_file_s, 1); + auto* res = xbt_new0(s_xbt_log_appender_t, 1); + res->do_append = &append2_file; + res->free_ = &free_append2_; + auto* data = xbt_new0(struct xbt_log_append2_file_s, 1); xbt_assert(arg); char* buf=xbt_strdup(arg); char* sep=strchr(buf,':'); diff --git a/src/xbt/xbt_log_layout_format.cpp b/src/xbt/xbt_log_layout_format.cpp index 43345d4af5..2cf7a320f3 100644 --- a/src/xbt/xbt_log_layout_format.cpp +++ b/src/xbt/xbt_log_layout_format.cpp @@ -185,10 +185,10 @@ static void xbt_log_layout_format_free(const s_xbt_log_layout_t* lay) xbt_log_layout_t xbt_log_layout_format_new(const char* arg) { - xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1); - res->do_layout = &xbt_log_layout_format_doit; - res->free_ = &xbt_log_layout_format_free; - res->data = xbt_strdup(arg); + auto* res = xbt_new0(s_xbt_log_layout_t, 1); + res->do_layout = &xbt_log_layout_format_doit; + res->free_ = &xbt_log_layout_format_free; + res->data = xbt_strdup(arg); return res; } diff --git a/src/xbt/xbt_log_layout_simple.cpp b/src/xbt/xbt_log_layout_simple.cpp index d460805e56..2f0d8552a8 100644 --- a/src/xbt/xbt_log_layout_simple.cpp +++ b/src/xbt/xbt_log_layout_simple.cpp @@ -71,8 +71,8 @@ static bool xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_ xbt_log_layout_t xbt_log_layout_simple_new(const char*) { - xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1); - res->do_layout = &xbt_log_layout_simple_doit; + auto* res = xbt_new0(s_xbt_log_layout_t, 1); + res->do_layout = &xbt_log_layout_simple_doit; return res; } -- 2.20.1