Skip to content

Commit 0287705

Browse files
author
Ivan Kochin
committed
UCP/WIREUP: Consider local distance during slow lanes dropping - revert
This reverts commit c8fb76b.
1 parent 1655e16 commit 0287705

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/ucp/wireup/select.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,18 +1461,12 @@ static double ucp_wireup_get_lane_bw(ucp_worker_h worker,
14611461
const ucp_wireup_select_info_t *sinfo,
14621462
const ucp_unpacked_address_t *address)
14631463
{
1464-
ucp_worker_iface_t *wiface = ucp_worker_iface(worker, sinfo->rsc_index);
1464+
ucp_context_h context = worker->context;
1465+
const uct_iface_attr_t *iface_attr;
14651466
double bw_local, bw_remote;
14661467

1467-
if (address->dst_version < 17) {
1468-
bw_local = ucp_tl_iface_bandwidth(worker->context,
1469-
&wiface->attr.bandwidth);
1470-
} else {
1471-
/* Compare BW including local distance to prevent EP reconfiguration
1472-
* since remote distance is included to remote_addr*/
1473-
bw_local = ucp_wireup_iface_bw_distance(wiface);
1474-
}
1475-
1468+
iface_attr = ucp_worker_iface_get_attr(worker, sinfo->rsc_index);
1469+
bw_local = ucp_tl_iface_bandwidth(context, &iface_attr->bandwidth);
14761470
bw_remote = address->address_list[sinfo->addr_index].iface_attr.bandwidth;
14771471

14781472
if (address->addr_version == UCP_OBJECT_VERSION_V2) {

0 commit comments

Comments
 (0)