TEST/GTEST/UCT: PR fixes

Author: michal-shalev

test/gtest/uct/test_atomic_key_reg_rdma_mem_type.cc

@@ -30,31 +30,28 @@ UCS_TEST_SKIP_COND_P(uct_atomic_key_reg_rdma_mem_type, fadd64,
                      !check_atomics(UCS_BIT(UCT_ATOMIC_OP_ADD), FOP64) ||
                      !check_rdma_memory())
 {
-    mapped_buffer *recvbuf     = nullptr;
-    const size_t buffer_size   = sizeof(uint64_t);
-    const size_t buffer_offset = 0;
-    const bool may_fail        = true;
-    const int num_retries      = 5;
-    const int sleep_usec       = 10000;
+    size_t buffer_size   = sizeof(uint64_t);
+    size_t buffer_offset = 0;
+    bool may_fail        = true;
+    int num_retries      = 5;
+    int sleep_usec       = 10000;
+    std::unique_ptr<mapped_buffer> recvbuf;
 
-    for (int i = 0; i < num_retries; ++i) {
+    for (int i = 0; (i < num_retries) && (nullptr == recvbuf.get()); ++i) {
         try {
-            {
-                scoped_log_handler slh(hide_errors_logger);
-                recvbuf = new mapped_buffer(buffer_size, receiver(),
-                                            buffer_offset, UCS_MEMORY_TYPE_RDMA,
-                                            UCT_MD_MEM_ACCESS_ALL, may_fail);
-            }
-            break;
-        } catch (ucs::test_abort_exception& e) {
+            scoped_log_handler slh(hide_errors_logger);
+            recvbuf.reset(new mapped_buffer(
+                buffer_size, receiver(), buffer_offset,
+                UCS_MEMORY_TYPE_RDMA, UCT_MD_MEM_ACCESS_ALL, may_fail));
+        } catch (const ucs::test_abort_exception& e) {
             UCS_TEST_MESSAGE << "Retry " << i + 1 << "/" << num_retries
                              << ": Buffer allocation failed - " << e.what();
             usleep(sleep_usec);
         }
+    }
 
-        if (i == (num_retries - 1)) {
-            ADD_FAILURE() << "Failed to allocate buffer";
-        }
+    if (nullptr == recvbuf.get()) {
+        ADD_FAILURE() << "Failed to allocate buffer";
     }
 
     uint64_t add = rand64();
@@ -63,8 +60,6 @@ UCS_TEST_SKIP_COND_P(uct_atomic_key_reg_rdma_mem_type, fadd64,
                         &uct_amo_test::atomic_fop<uint64_t, UCT_ATOMIC_OP_ADD>),
                 *recvbuf, std::vector<uint64_t>(num_senders(), add), false);
     wait_for_remote();
-
-    delete recvbuf;
 }
 
 UCT_INSTANTIATE_RC_DC_TEST_CASE(uct_atomic_key_reg_rdma_mem_type);

test/gtest/uct/uct_test.cc

@@ -964,6 +964,8 @@ void uct_test::entity::mem_alloc(size_t length, unsigned mem_flags,
     }
 
     if (may_fail && (status != UCS_OK)) {
+        UCS_TEST_MESSAGE << "Failed to allocate memory: "
+                         << ucs_status_string(status);
         throw ucs::test_abort_exception();
     } else {
         ASSERT_UCS_OK(status);