Skip to content

TEST/TAG: Fix tag test to check inline data flag #5961

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
yosefe merged 1 commit into from
Nov 30, 2020
Merged

TEST/TAG: Fix tag test to check inline data flag #5961

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
15 changes: 11 additions & 4 deletions test/gtest/uct/test_tag.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,14 +371,19 @@ class test_tag : public uct_test {
user_ctx->consumed = true;
}

static void verify_completed(recv_ctx *user_ctx, uct_tag_t stag, size_t length)
{
EXPECT_EQ(user_ctx->tag, (stag & user_ctx->tmask));
EXPECT_EQ(user_ctx->mbuf->length(), length);
}

static void completed(uct_tag_context_t *self, uct_tag_t stag, uint64_t imm,
size_t length, void *inline_data, ucs_status_t status)
{
recv_ctx *user_ctx = ucs_container_of(self, recv_ctx, uct_ctx);
user_ctx->comp = true;
user_ctx->status = status;
EXPECT_EQ(user_ctx->tag, (stag & user_ctx->tmask));
EXPECT_EQ(user_ctx->mbuf->length(), length);
verify_completed(user_ctx, stag, length);
}

static void sw_rndv_completed(uct_tag_context_t *self, uct_tag_t stag,
Expand All @@ -388,8 +393,10 @@ class test_tag : public uct_test {
recv_ctx *user_ctx = ucs_container_of(self, recv_ctx, uct_ctx);
user_ctx->sw_rndv = true;
user_ctx->status = status;
EXPECT_EQ(user_ctx->tag, (stag & user_ctx->tmask));
EXPECT_EQ(user_ctx->mbuf->length(), header_length);
if (flags & UCT_TAG_RECV_CB_INLINE_DATA) {

@dmitrygx dmitrygx Nov 27, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[minor/imp] can reduce duplication:

static void sw_rndv_completed(uct_tag_context_t *self, uct_tag_t stag,
                              const void *header, unsigned header_length,
                              ucs_status_t status, unsigned flags)
{
    recv_ctx *user_ctx = ucs_container_of(self, recv_ctx, uct_ctx);
    user_ctx->sw_rndv  = true;
    if (flags & UCT_TAG_RECV_CB_INLINE_DATA) {
        memcpy(user_ctx->mbuf->ptr(), header, header_length);
    }
    completed(self, stag, 0, header_length, NULL, status);
}

memcpy(user_ctx->mbuf->ptr(), header, header_length);
}
verify_completed(user_ctx, stag, header_length);
}

static ucs_status_t unexp_eager(void *arg, void *data, size_t length,
Expand Down