Skip to content

v4.0.x: portals4: fix flow control bugs #7229

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
merged 2 commits into from
Dec 18, 2019
Merged

v4.0.x: portals4: fix flow control bugs #7229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f5a79b
mtl-portals4: don't finalize flow control if Portals4 was not initial…
tkordenbrock Oct 9, 2019
2c082b6
btl-portals4: fix a flow control configure bug
tkordenbrock Oct 9, 2019
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
8 changes: 4 additions & 4 deletions ompi/mca/mtl/portals4/mtl_portals4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2010-2015 Sandia National Laboratories. All rights reserved.
* Copyright (c) 2010-2019 Sandia National Laboratories. All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
Expand Down Expand Up @@ -551,12 +551,12 @@ ompi_mtl_portals4_finalize(struct mca_mtl_base_module_t *mtl)
if (0 == ompi_mtl_portals4.need_init) {
opal_progress_unregister(ompi_mtl_portals4_progress);
while (0 != ompi_mtl_portals4_progress()) { }
}

#if OMPI_MTL_PORTALS4_FLOW_CONTROL
ompi_mtl_portals4_flowctl_fini();
ompi_mtl_portals4_flowctl_fini();
#endif
ompi_mtl_portals4_recv_short_fini();
ompi_mtl_portals4_recv_short_fini();
}

if (!PtlHandleIsEqual(ompi_mtl_portals4.long_overflow_me_h, PTL_INVALID_HANDLE)) {
PtlMEUnlink(ompi_mtl_portals4.long_overflow_me_h);
Expand Down
8 changes: 4 additions & 4 deletions opal/mca/btl/portals4/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2010 Sandia National Laboratories. All rights reserved.
# Copyright (c) 2010-2019 Sandia National Laboratories. All rights reserved.
# Copyright (c) 2014 Bull SAS. All rights reserved.
# $COPYRIGHT$
#
Expand Down Expand Up @@ -44,9 +44,9 @@ AC_DEFUN([MCA_opal_btl_portals4_CONFIG],[
[AC_HELP_STRING([--enable-btl-portals4-flow-control],
[enable flow control for Portals 4 BTL (default: disabled)])])
AC_MSG_CHECKING([whether to enable flow control])
if test "$enable_btl_portals4_flow_control" != "yes"; then
AC_MSG_RESULT([no])
btl_portals4_flow_control_enabled=0
if test "$enable_btl_portals4_flow_control" != "no"; then
AC_MSG_RESULT([yes])
btl_portals4_flow_control_enabled=1
else
AC_MSG_RESULT([no])
btl_portals4_flow_control_enabled=0
Expand Down