diff --git a/test/gtest/common/test_helpers.cc b/test/gtest/common/test_helpers.cc index f39f74c5000..a73d6708507 100644 --- a/test/gtest/common/test_helpers.cc +++ b/test/gtest/common/test_helpers.cc @@ -402,7 +402,7 @@ ucx_env_cleanup::ucx_env_cleanup() { if ((env_var.find("=") != std::string::npos) && (env_var.find(UCS_DEFAULT_ENV_PREFIX, 0, prefix_len) != std::string::npos)) { - ucx_env_storage.push_back(env_var); + ucx_env_storage.push_back(std::move(env_var)); } } @@ -799,7 +799,7 @@ sock_addr_storage::sock_addr_storage(const ucs_sock_addr_t &ucs_sock_addr, m_netdev_name = ""; } else { set_sock_addr(*ucs_sock_addr.addr, ucs_sock_addr.addrlen, - is_rdmacm_netdev, netdev_name); + is_rdmacm_netdev, std::move(netdev_name)); } } @@ -813,7 +813,7 @@ void sock_addr_storage::set_sock_addr(const struct sockaddr &addr, m_size = size; m_is_valid = true; m_is_rdmacm_netdev = is_rdmacm_netdev; - m_netdev_name = netdev_name; + m_netdev_name = std::move(netdev_name); } void sock_addr_storage::reset_to_any() { diff --git a/test/gtest/ucm/malloc_hook.cc b/test/gtest/ucm/malloc_hook.cc index 881f8a09551..452cf44bf66 100644 --- a/test/gtest/ucm/malloc_hook.cc +++ b/test/gtest/ucm/malloc_hook.cc @@ -1000,7 +1000,7 @@ UCS_TEST_SKIP_COND_F(malloc_hook_cplusplus, mmap_ptrs, RUNNING_ON_VALGRIND) { */ while (m_mapped_size == 0) { std::vector str(size, 'r'); - ptrs.push_back(str); + ptrs.push_back(std::move(str)); ++large_blocks; } diff --git a/test/gtest/ucp/test_ucp_context.cc b/test/gtest/ucp/test_ucp_context.cc index e5e07ca2bc1..9806d057452 100644 --- a/test/gtest/ucp/test_ucp_context.cc +++ b/test/gtest/ucp/test_ucp_context.cc @@ -422,7 +422,7 @@ class test_ucp_devices_config : public ucp_test { for (const std::string &dev_name : dev_names) { std::string base_name; if (get_device_base_name(dev_name, base_name)) { - base_names.insert(base_name); + base_names.insert(std::move(base_name)); } } return base_names; diff --git a/test/gtest/ucp/test_ucp_proto.cc b/test/gtest/ucp/test_ucp_proto.cc index 7e7e348e4dc..6c371c0b7b4 100644 --- a/test/gtest/ucp/test_ucp_proto.cc +++ b/test/gtest/ucp/test_ucp_proto.cc @@ -1323,7 +1323,7 @@ class test_proto_perf : public ucs::test { return make_perf_ptr(perf); } - static void add_funcs(perf_ptr_t perf, size_t start, size_t end, + static void add_funcs(const perf_ptr_t &perf, size_t start, size_t end, const perf_factors_map_t &factors) { ucp_proto_perf_factors_t perf_factors = @@ -1339,7 +1339,7 @@ class test_proto_perf : public ucs::test { perf_factors, perf_node, NULL)); } - static void add_func(perf_ptr_t perf, size_t start, size_t end, + static void add_func(const perf_ptr_t &perf, size_t start, size_t end, ucp_proto_perf_factor_id_t factor_id, ucs_linear_func_t func) { @@ -1352,13 +1352,14 @@ class test_proto_perf : public ucs::test { add_func(m_perf, start, end, factor_id, func); } - static ucp_proto_perf_segment_t *find_lb(perf_ptr_t perf, size_t start) + static ucp_proto_perf_segment_t * + find_lb(const perf_ptr_t &perf, size_t start) { return ucp_proto_perf_find_segment_lb(perf.get(), start); } static const ucp_proto_flat_perf_range_t * - find_lb(flat_perf_ptr_t flat_perf, size_t start) + find_lb(const flat_perf_ptr_t &flat_perf, size_t start) { return ucp_proto_flat_perf_find_lb(flat_perf.get(), start); } @@ -1443,8 +1444,8 @@ class test_proto_perf : public ucs::test { } template - void - expect_perf_empty_range(PerfPtrType perf, size_t start, size_t end) const + void expect_perf_empty_range(const PerfPtrType &perf, size_t start, + size_t end) const { ASSERT_NE(perf.get(), nullptr); auto *seg = find_lb(perf, start); @@ -1454,8 +1455,8 @@ class test_proto_perf : public ucs::test { << " end=" << end; } - void expect_flat_range(flat_perf_ptr_t flat_perf, size_t start, size_t end, - ucs_linear_func_t exp_func) const + void expect_flat_range(const flat_perf_ptr_t &flat_perf, size_t start, + size_t end, ucs_linear_func_t exp_func) const { auto *range = find_lb(flat_perf, start); size_t midpoint = start + (end - start) / 2; @@ -1714,7 +1715,7 @@ UCS_TEST_F(test_proto_perf, agg2) local_cpu_func); UCS_TEST_MESSAGE << perf2.get(); - m_perf = aggregate({perf1, perf2}); + m_perf = aggregate({std::move(perf1), std::move(perf2)}); make_flat_perf(); print_perf(); @@ -1754,7 +1755,7 @@ UCS_TEST_F(test_proto_perf, agg3) local_cpu_func); UCS_TEST_MESSAGE << perf3.get(); - m_perf = aggregate({perf1, perf2, perf3}); + m_perf = aggregate({std::move(perf1), std::move(perf2), std::move(perf3)}); make_flat_perf(); print_perf(); @@ -1917,7 +1918,7 @@ class test_proto_perf_aggregate : public test_proto_perf_random { private: // Collect points of sampling based on perf structure segments - static std::vector get_sample_points(perf_ptr_t perf); + static std::vector get_sample_points(const perf_ptr_t &perf); // Calculate the expected aggregation result at a given point. If the // expected result is undefined, return nullptr. @@ -1927,7 +1928,7 @@ class test_proto_perf_aggregate : public test_proto_perf_random { }; std::vector -test_proto_perf_aggregate::get_sample_points(perf_ptr_t perf) +test_proto_perf_aggregate::get_sample_points(const perf_ptr_t &perf) { std::vector points; @@ -1957,7 +1958,7 @@ test_proto_perf_aggregate::expected_aggregate_result( const std::vector &perfs, size_t point) { perf_factors_map_t agg; - for (auto perf : perfs) { + for (const auto &perf : perfs) { ucp_proto_perf_segment_t *seg = find_lb(perf, point); if ((seg == NULL) || (point < ucp_proto_perf_segment_start(seg))) { return nullptr; // Point not found in one of the perf objects @@ -1977,7 +1978,8 @@ test_proto_perf_aggregate::expected_aggregate_result( } } - return std::unique_ptr(new perf_factors_map_t(agg)); + return std::unique_ptr( + new perf_factors_map_t(std::move(agg))); } void test_proto_perf_aggregate::test_random_funcs(unsigned num_perfs, @@ -1990,7 +1992,7 @@ void test_proto_perf_aggregate::test_random_funcs(unsigned num_perfs, }); std::set sample_points; - for (auto perf : perfs) { + for (const auto &perf : perfs) { auto perf_points = get_sample_points(perf); std::copy(perf_points.begin(), perf_points.end(), std::inserter(sample_points, sample_points.begin())); diff --git a/test/gtest/ucp/test_ucp_proto_mock.cc b/test/gtest/ucp/test_ucp_proto_mock.cc index fb0aa47ce02..f9ed0f6e327 100644 --- a/test/gtest/ucp/test_ucp_proto_mock.cc +++ b/test/gtest/ucp/test_ucp_proto_mock.cc @@ -427,8 +427,8 @@ class test_ucp_proto_mock : public ucp_test, public mock_iface { std::string desc, std::string config) : range_start(range_start), range_end(range_end), - desc(desc), - config(config){}; + desc(std::move(desc)), + config(std::move(config)){}; bool operator==(const proto_select_data &other) const { diff --git a/test/gtest/ucp/test_ucp_sockaddr.cc b/test/gtest/ucp/test_ucp_sockaddr.cc index 09be7c394ee..c02d066fd99 100644 --- a/test/gtest/ucp/test_ucp_sockaddr.cc +++ b/test/gtest/ucp/test_ucp_sockaddr.cc @@ -1167,7 +1167,7 @@ UCS_TEST_P(test_ucp_sockaddr, listen_inaddr_any) { /* get the actual port which was selected by listener */ test_addr.set_port(m_test_addr.get_port()); /* restore address */ - m_test_addr = test_addr; + m_test_addr = std::move(test_addr); connect_and_send_recv(false, SEND_DIRECTION_C2S); } diff --git a/test/gtest/ucp/ucp_test.cc b/test/gtest/ucp/ucp_test.cc index ad8c70ce154..2a8db3400f1 100644 --- a/test/gtest/ucp/ucp_test.cc +++ b/test/gtest/ucp/ucp_test.cc @@ -475,7 +475,7 @@ void ucp_test::add_variant_value(std::vector& values, int value, const std::string& name) { ucp_test_variant_value entry = {value, name}; - values.push_back(entry); + values.push_back(std::move(entry)); } void ucp_test::add_variant_with_value(std::vector& variants, @@ -549,7 +549,7 @@ ucp_test::enum_test_params(const std::vector& variants, while (ss.good()) { std::string tl_name; std::getline(ss, tl_name, ','); - result.back().transports.push_back(tl_name); + result.back().transports.push_back(std::move(tl_name)); } } diff --git a/test/gtest/ucs/test_topo.cc b/test/gtest/ucs/test_topo.cc index 49c99542d60..bf73a633333 100644 --- a/test/gtest/ucs/test_topo.cc +++ b/test/gtest/ucs/test_topo.cc @@ -915,7 +915,7 @@ UCS_TEST_F(test_topo, sibling) { auto gpu = m_gpus[0]; if (!sibling_dma.empty()) { dma = sibling_dma; - gpu = sibling_gpu; + gpu = std::move(sibling_gpu); UCS_TEST_MESSAGE << "Found sibling " << "dma=" << dma << " gpu=" << gpu; } diff --git a/test/gtest/ucs/test_topo_groups.cc b/test/gtest/ucs/test_topo_groups.cc index 2d24438593c..e3e6e27da69 100644 --- a/test/gtest/ucs/test_topo_groups.cc +++ b/test/gtest/ucs/test_topo_groups.cc @@ -139,7 +139,7 @@ class test_topo_groups : public ucs::test { numa.numa_node, user_value)); } - numa.gpus.push_back(gpu_devices); + numa.gpus.push_back(std::move(gpu_devices)); } } @@ -166,7 +166,7 @@ class test_topo_groups : public ucs::test { UCS_SYS_DEVICE_USER_VALUE_EMPTY)); } - numa.nics.push_back(nic_ports); + numa.nics.push_back(std::move(nic_ports)); } } diff --git a/test/gtest/uct/ib/test_srd.cc b/test/gtest/uct/ib/test_srd.cc index 34198261e1d..8e1459c9e4a 100644 --- a/test/gtest/uct/ib/test_srd.cc +++ b/test/gtest/uct/ib/test_srd.cc @@ -182,7 +182,7 @@ class test_srd : public uct_test { int c = 1; completion comp[2]; - auto noop = [](void *arg, void *data, size_t length, unsigned flags) { + auto noop = [](void *arg, void *data, size_t length, unsigned) { return UCS_OK; }; @@ -329,15 +329,16 @@ UCS_TEST_P(test_srd, am_short_iov_failure) scoped_log_handler slh(wrap_errors_logger); char payload[64]; ucs_status_t status; - uct_iov_t iov; + uct_iov_t iov[2] = {}; - status = uct_ep_am_short_iov(m_e1->ep(0), 32, &iov, 1); + status = uct_ep_am_short_iov(m_e1->ep(0), 32, iov, 1); ASSERT_UCS_STATUS_EQ(UCS_ERR_INVALID_PARAM, status); - status = uct_ep_am_short_iov(m_e1->ep(0), 14, &iov, 2); - iov.length = sizeof(payload); - iov.buffer = payload; - iov.count = 1; - status = uct_ep_am_short_iov(m_e1->ep(0), 14, &iov, 1); + status = uct_ep_am_short_iov(m_e1->ep(0), 14, iov, 2); + ASSERT_UCS_STATUS_EQ(UCS_ERR_INVALID_PARAM, status); + iov[0].length = sizeof(payload); + iov[0].buffer = payload; + iov[0].count = 1; + status = uct_ep_am_short_iov(m_e1->ep(0), 14, iov, 1); ASSERT_UCS_STATUS_EQ(UCS_ERR_INVALID_PARAM, status); } @@ -362,7 +363,7 @@ UCS_TEST_P(test_srd, am_zcopy_failure) { scoped_log_handler slh(wrap_errors_logger); ucs_status_t status; - uct_iov_t iov[3]; + uct_iov_t iov[3] = {}; for (auto i = 0; i < 3; ++i) { iov[i].length = 64; @@ -394,7 +395,7 @@ UCS_TEST_P(test_srd, get_bcopy_failure) UCS_TEST_P(test_srd, get_zcopy_failure) { scoped_log_handler slh(wrap_errors_logger); - uct_iov_t iov[3]; + uct_iov_t iov[3] = {}; ucs_status_t status; for (auto i = 0; i < 3; ++i) { diff --git a/test/gtest/uct/test_amo_add_xor.cc b/test/gtest/uct/test_amo_add_xor.cc index 0a2966d7a78..1a078b70b22 100644 --- a/test/gtest/uct/test_amo_add_xor.cc +++ b/test/gtest/uct/test_amo_add_xor.cc @@ -36,8 +36,9 @@ class uct_amo_add_xor_test : public uct_amo_test { } } - run_workers(static_cast(&uct_amo_test::atomic_op), - recvbuf, add_vec, true); + run_workers(static_cast( + &uct_amo_test::atomic_op), + recvbuf, std::move(add_vec), true); wait_for_remote(); EXPECT_EQ(exp_result, *(T*)recvbuf.ptr()); diff --git a/test/gtest/uct/test_amo_and_or.cc b/test/gtest/uct/test_amo_and_or.cc index 3313ac5a63f..d66cb491e29 100644 --- a/test/gtest/uct/test_amo_and_or.cc +++ b/test/gtest/uct/test_amo_and_or.cc @@ -35,8 +35,9 @@ class uct_amo_and_or_test : public uct_amo_test { } } - run_workers(static_cast(&uct_amo_test::atomic_op), - recvbuf, op_vec, false); + run_workers(static_cast( + &uct_amo_test::atomic_op), + recvbuf, std::move(op_vec), false); wait_for_remote(); EXPECT_EQ(exp_result, *(T*)recvbuf.ptr()); diff --git a/test/gtest/uct/test_amo_swap.cc b/test/gtest/uct/test_amo_swap.cc index 813d9ed434b..26fb9638397 100644 --- a/test/gtest/uct/test_amo_swap.cc +++ b/test/gtest/uct/test_amo_swap.cc @@ -55,7 +55,7 @@ class uct_amo_swap_test : public uct_amo_test { } } - run_workers(send, recvbuf, swap_vec, true); + run_workers(send, recvbuf, std::move(swap_vec), true); wait_for_remote(); add_reply_safe(*(T*)recvbuf.ptr()); diff --git a/test/gtest/uct/test_uct_perf.cc b/test/gtest/uct/test_uct_perf.cc index 73b7e2a5e62..15fc36fe5c5 100644 --- a/test/gtest/uct/test_uct_perf.cc +++ b/test/gtest/uct/test_uct_perf.cc @@ -264,7 +264,7 @@ class test_uct_loopback_cuda : public test_uct_perf { /* gdr_copy test supports from host to GPU mem case only */ if (has_transport("gdr_copy")) { - result.push_back(input); + result.push_back(std::move(input)); } else if (has_transport("cuda_ipc")) { /* cuda_ipc test only supports GPU-GPU case */ result.push_back({UCS_MEMORY_TYPE_CUDA, UCS_MEMORY_TYPE_CUDA});