Skip to content
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

Jump to bottom

UCP/AM: Use correct ep for short send with reply - v1.10.x #6399

Merged
merged 1 commit into from
Feb 25, 2021
Merged

UCP/AM: Use correct ep for short send with reply - v1.10.x #6399

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/ucp/core/ucp_am.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,6 @@ ucp_am_send_short_reply(ucp_ep_h ep, uint16_t id, uint16_t flags,
const void *header, size_t header_length,
const void *payload, size_t length)
{
uct_ep_h am_ep = ucp_ep_get_am_uct_ep(ep);
size_t tx_length;
ucp_am_hdr_t hdr;
const void *data;
Expand Down Expand Up @@ -552,7 +551,8 @@ ucp_am_send_short_reply(ucp_ep_h ep, uint16_t id, uint16_t flags,
memcpy(UCS_PTR_BYTE_OFFSET(tx_buffer, sizeof(ucs_ptr_map_key_t)),
data, tx_length);

return uct_ep_am_short(am_ep, UCP_AM_ID_SINGLE_REPLY, hdr.u64, tx_buffer,
return uct_ep_am_short(ucp_ep_get_am_uct_ep(ep), UCP_AM_ID_SINGLE_REPLY,
hdr.u64, tx_buffer,
tx_length + sizeof(ucs_ptr_map_key_t));
}

Expand Down
22 changes: 20 additions & 2 deletions test/gtest/ucp/test_ucp_am.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ class test_ucp_am_nbx : public test_ucp_am_base {
{
size_t small_hdr_size = 8;

test_am_send_recv(size, small_hdr_size, flags);
test_am_send_recv(size, 0, flags);
test_am_send_recv(size, small_hdr_size, flags);

if (max_am_hdr() > small_hdr_size) {
test_am_send_recv(size, max_am_hdr(), flags);
Expand Down Expand Up @@ -698,19 +698,37 @@ class test_ucp_am_nbx_dts : public test_ucp_am_nbx {
UCS_BIT(UCP_DATATYPE_IOV) |
UCS_BIT(UCP_DATATYPE_GENERIC);

virtual ucp_ep_params_t get_ep_params()
{
ucp_ep_params_t ep_params = test_ucp_am_nbx::get_ep_params();

ep_params.field_mask |= UCP_EP_PARAM_FIELD_ERR_HANDLING_MODE;
ep_params.err_mode = static_cast<ucp_err_handling_mode_t>(
get_variant_value(2));
return ep_params;
}

static void get_test_dts(std::vector<ucp_test_variant>& variants)
{
/* coverity[overrun-buffer-val] */
add_variant_values(variants, test_ucp_am_base::get_test_variants,
dts_bitmap, ucp_datatype_class_names);
}

static void get_test_variants(std::vector<ucp_test_variant>& variants)
static void get_test_dts_reply(std::vector<ucp_test_variant>& variants)
{
add_variant_values(variants, get_test_dts, 0);
add_variant_values(variants, get_test_dts, UCP_AM_SEND_REPLY, "reply");
}

static void get_test_variants(std::vector<ucp_test_variant>& variants)
{
add_variant_values(variants, get_test_dts_reply,
UCP_ERR_HANDLING_MODE_NONE);
add_variant_values(variants, get_test_dts_reply,
UCP_ERR_HANDLING_MODE_PEER, "errh");
}

void init()
{
test_ucp_am_nbx::init();
Expand Down