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

UCP/WIREUP: Implement common copying of lanes function for futher re-use #5610

Closed
wants to merge 17 commits into from
Closed

UCP/WIREUP: Implement common copying of lanes function for futher re-use #5610

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d96e4da
UCP/WIREUP: Implement common copying of lanes function for futher re-use
dmitrygx Aug 24, 2020
9f70f8d
UCP/WIREUP: Add assertion to make sure that from_ep is an owner of UC…
dmitrygx Aug 25, 2020
9b9e72d
UCP/WIREUP: Fix assertion
dmitrygx Aug 25, 2020
224b244
UCP/WIREUP: Don't create WIREUP EP in to_ep if there is no UCT_EP
dmitrygx Aug 26, 2020
312321a
UCP/WIREUP: Fix review comments
dmitrygx Aug 26, 2020
2754df7
UCP/WIREUP: Report fatal error if failed to allocate WIREUP EP
dmitrygx Aug 26, 2020
d8c27f1
UCP/WIREUP: Check that to_ep and from_ep have the same config
dmitrygx Aug 26, 2020
469168c
UCP/WIREUP: Compare config_kets instead of cfg_index
dmitrygx Aug 26, 2020
d698bf6
UCP/WIREUP: No need for assert
dmitrygx Aug 26, 2020
ed8a029
UCP/WIREUP: Improve documentation
dmitrygx Aug 27, 2020
4f3c94e
Merge branch 'master' into topic/ucp/pre_cm
dmitrygx Aug 27, 2020
be70c93
UCP/WIREUP: Set local_conencted if needed
dmitrygx Aug 28, 2020
27d718c
UCP/WIREUP: Fix resolving proxy lanes
dmitrygx Aug 28, 2020
ec96435
UCP/WIREUP: Fix review comments
dmitrygx Sep 1, 2020
5d2aa0a
UCP/WIREUP: Remove debug note from LOCAL_CONENCTED flag
dmitrygx Sep 1, 2020
863b57d
UCP/WIREUP: Fix static checker issue
dmitrygx Sep 1, 2020
4c78ae0
Merge branch 'master' into topic/ucp/pre_cm
dmitrygx Sep 2, 2020
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
11 changes: 6 additions & 5 deletions src/ucp/wireup/wireup_cm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,17 +274,18 @@ static void ucp_cm_copy_ep_lanes(ucp_ep_h to_ep, ucp_ep_h from_ep,
}

ucs_assert(to_ep->uct_eps[lane_idx] == NULL);
status = ucp_wireup_ep_create(to_ep, &to_ep->uct_eps[lane_idx]);
if (status != UCS_OK) {
/* coverity[leaked_storage] */
continue;
}

uct_ep = ucp_wireup_extract_lane(from_ep, lane_idx);
brminich marked this conversation as resolved.
Show resolved Hide resolved
if (uct_ep == NULL) {
continue;
}

status = ucp_wireup_ep_create(to_ep, &to_ep->uct_eps[lane_idx]);
Copy link
Contributor

Choose a reason for hiding this comment

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

can we just take existing wireup ep, like it was done before?

Copy link
Member Author

Choose a reason for hiding this comment

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

no, since we will need this to set who is the owner of the UCT EP- TMP EP or user's UCP EP

if (status != UCS_OK) {
/* coverity[leaked_storage] */
Copy link
Contributor

Choose a reason for hiding this comment

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

if we failed to create wireup_ep, what happens to the lane we extracted?

Copy link
Member Author

Choose a reason for hiding this comment

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

added ucs_fatal() instead of continue;

continue;
}

ucs_assert(!ucp_wireup_ep_test(from_ep->uct_eps[lane_idx]) ||
ucp_wireup_ep(from_ep->uct_eps[lane_idx])->super.is_owner);

Expand Down