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

UCT: fix hang when using polling fd #1492 #1561

Closed
wants to merge 3 commits into from
Closed

UCT: fix hang when using polling fd #1492 #1561

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71474ca
UCT: fix hang when using polling fd #1492
evgeny-leksikov Jun 2, 2017
a326dc3
Revert "UCT: fix hang when using polling fd #1492"
evgeny-leksikov Jun 4, 2017
7e8f2da
UCT/WAKEUP: fix hang when using polling fd #1492
evgeny-leksikov Jun 4, 2017
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
7 changes: 1 addition & 6 deletions src/uct/ib/base/ib_iface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,11 +866,6 @@ ucs_status_t uct_ib_iface_wakeup_arm(uct_wakeup_h wakeup)
ibv_ack_cq_events(iface->recv_cq, recv_cq_count);
}

/* avoid re-arming the interface if any events exists */
if ((send_cq_count > 0) || (recv_cq_count > 0)) {
return UCS_ERR_BUSY;
}

if (wakeup->events & UCT_WAKEUP_TX_COMPLETION) {
status = iface->ops->arm_tx_cq(iface);
if (status != UCS_OK) {
Expand All @@ -885,7 +880,7 @@ ucs_status_t uct_ib_iface_wakeup_arm(uct_wakeup_h wakeup)
}
}

return UCS_OK;
return ((send_cq_count > 0) || (recv_cq_count > 0)) ? UCS_ERR_BUSY : UCS_OK;
}

ucs_status_t uct_ib_iface_wakeup_get_fd(uct_wakeup_h wakeup, int *fd_p)
Expand Down