Skip to content

Fix two testNuma tests #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Fix two testNuma tests #733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions test/provider_os_memory_multiple_numa_nodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,19 @@ TEST_F(testNuma, checkModeInterleave) {

// Test where each page will be allocated.
// Get the first numa node for ptr; Each next page is expected to be on next nodes.
int node = -1;
ASSERT_NO_FATAL_FAILURE(getNumaNodeByPtr(ptr, &node));
ASSERT_GE(node, 0);
int index = -1;
ASSERT_NO_FATAL_FAILURE(getNumaNodeByPtr(ptr, &index));
for (size_t i = 0; i < numa_nodes.size(); i++) {
if (numa_nodes[i] == (unsigned)node) {
index = i;
break;
}
}
ASSERT_GE(index, 0);
ASSERT_LT(index, numa_nodes.size());

for (size_t i = 1; i < (size_t)pages_num; i++) {
index = (index + 1) % numa_nodes.size();
EXPECT_NODE_EQ((char *)ptr + page_size * i, numa_nodes[index]);
Expand Down Expand Up @@ -417,8 +428,19 @@ TEST_F(testNuma, checkModeInterleaveCustomPartSize) {
memset(ptr, 0xFF, size);
// Test where each page will be allocated.
// Get the first numa node for ptr; Each next part is expected to be on next nodes.
int node = -1;
ASSERT_NO_FATAL_FAILURE(getNumaNodeByPtr(ptr, &node));
ASSERT_GE(node, 0);
int index = -1;
ASSERT_NO_FATAL_FAILURE(getNumaNodeByPtr(ptr, &index));
for (size_t i = 0; i < numa_nodes.size(); i++) {
if (numa_nodes[i] == (unsigned)node) {
index = i;
break;
}
}
ASSERT_GE(index, 0);
ASSERT_LT(index, numa_nodes.size());

for (size_t i = 0; i < (size_t)part_num; i++) {
for (size_t j = 0; j < part_size; j += page_size) {
ASSERT_NODE_EQ((char *)ptr + part_size * i + j, numa_nodes[index]);
Expand Down
Loading