Skip to content

Commit 1d4398e

Browse files
committed
[Fix] Adapt ASU tests to BufferManager handles
1 parent b0c54a2 commit 1d4398e

3 files changed

Lines changed: 42 additions & 10 deletions

File tree

ucm/transport/kv/asu/test/case/connection_manager_test.cc

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,15 @@ class StubTransProvider : public TransProvider {
6464
{
6565
return {};
6666
}
67-
Status RegisterMemory(ConnectionHandle, const std::vector<RegisterMemoryDesc>&,
68-
std::vector<MemHandle>&) override
67+
Status RegisterMemory(ConnectionHandle, const std::vector<RegisterMemoryDesc>& descs,
68+
std::vector<MemHandle>& handles) override
6969
{
70+
handles.clear();
71+
handles.reserve(descs.size());
72+
for (std::size_t index = 0; index < descs.size(); ++index) {
73+
handles.push_back(reinterpret_cast<MemHandle>(static_cast<std::uintptr_t>(index) +
74+
static_cast<std::uintptr_t>(1)));
75+
}
7076
return Status::OK();
7177
}
7278
std::vector<Status> UnregisterMemory(const std::vector<UnregisterMemoryDesc>&) override
@@ -78,7 +84,11 @@ class StubTransProvider : public TransProvider {
7884
return Status::OK();
7985
}
8086
std::vector<Status> FreeThread(const std::vector<ThreadHandle>&) override { return {}; }
81-
Status GetMemTokenId(MemHandle, uint32_t&) override { return Status::OK(); }
87+
Status GetMemTokenId(MemHandle, uint32_t& tokenId) override
88+
{
89+
tokenId = 1;
90+
return Status::OK();
91+
}
8292
};
8393

8494
AsuEndpoint MakeEndpoint(const std::string& ip = "10.0.0.1")

ucm/transport/kv/asu/trans/test/asu_submit_flow_test.cpp

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,15 @@ class StubTransProvider : public TransProvider {
6464
return std::vector<Status>(ioBatches.size(), Status::OK());
6565
}
6666

67-
Status RegisterMemory(ConnectionHandle, const std::vector<RegisterMemoryDesc>&,
68-
std::vector<MemHandle>&) override
67+
Status RegisterMemory(ConnectionHandle, const std::vector<RegisterMemoryDesc>& descs,
68+
std::vector<MemHandle>& handles) override
6969
{
70+
handles.clear();
71+
handles.reserve(descs.size());
72+
for (std::size_t index = 0; index < descs.size(); ++index) {
73+
handles.push_back(reinterpret_cast<MemHandle>(static_cast<std::uintptr_t>(index) +
74+
static_cast<std::uintptr_t>(1)));
75+
}
7076
return Status::OK();
7177
}
7278

@@ -82,7 +88,11 @@ class StubTransProvider : public TransProvider {
8288

8389
std::vector<Status> FreeThread(const std::vector<ThreadHandle>&) override { return {}; }
8490

85-
Status GetMemTokenId(MemHandle, uint32_t&) override { return Status::OK(); }
91+
Status GetMemTokenId(MemHandle, uint32_t& tokenId) override
92+
{
93+
tokenId = 1;
94+
return Status::OK();
95+
}
8696
};
8797

8898
class AsuSubmitFlowBufferTest : public ::testing::Test {
@@ -290,4 +300,4 @@ TEST(AsuSubmitFlowTest, SendSubBatchBuffersFailsAllSentSubBatchesWhenStatusCount
290300
}
291301

292302
} // namespace
293-
} // namespace UC::ASU
303+
} // namespace UC::ASU

ucm/transport/kv/asu/trans/test/transport_task_completion_test.cpp

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
* */
2424
#include <acl/acl.h>
2525
#include <atomic>
26+
#include <cstddef>
2627
#include <cstdint>
2728
#include <gtest/gtest.h>
29+
#include <vector>
2830
#define private public
2931
#include "asu_transport_impl.h"
3032
#undef private
@@ -56,9 +58,15 @@ class StubTransProvider : public TransProvider {
5658
{
5759
return {};
5860
}
59-
Status RegisterMemory(ConnectionHandle, const std::vector<RegisterMemoryDesc>&,
60-
std::vector<MemHandle>&) override
61+
Status RegisterMemory(ConnectionHandle, const std::vector<RegisterMemoryDesc>& descs,
62+
std::vector<MemHandle>& handles) override
6163
{
64+
handles.clear();
65+
handles.reserve(descs.size());
66+
for (std::size_t index = 0; index < descs.size(); ++index) {
67+
handles.push_back(reinterpret_cast<MemHandle>(static_cast<std::uintptr_t>(index) +
68+
static_cast<std::uintptr_t>(1)));
69+
}
6270
return Status::OK();
6371
}
6472
std::vector<Status> UnregisterMemory(const std::vector<UnregisterMemoryDesc>&) override
@@ -70,7 +78,11 @@ class StubTransProvider : public TransProvider {
7078
return Status::OK();
7179
}
7280
std::vector<Status> FreeThread(const std::vector<ThreadHandle>&) override { return {}; }
73-
Status GetMemTokenId(MemHandle, uint32_t&) override { return Status::OK(); }
81+
Status GetMemTokenId(MemHandle, uint32_t& tokenId) override
82+
{
83+
tokenId = 1;
84+
return Status::OK();
85+
}
7486
};
7587

7688
class TransportTaskCompletionTest : public ::testing::Test {

0 commit comments

Comments
 (0)