ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #7229 from tkordenbrock/topic/v4.0.x/portals4.fix.flowcontrol.bugs

Просмотр исходного кода 
v4.0.x: portals4: fix flow control bugs
Этот коммит содержится в:
Howard Pritchard 2019-12-18 08:35:46 -07:00 коммит произвёл GitHub
родитель 3f752f1d4f 2c082b6c7c
Коммит f6914ee35c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 8 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
ompi/mca/mtl/portals4/mtl_portals4.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * 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 (c) 2014 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -551,12 +551,12 @@ ompi_mtl_portals4_finalize(struct mca_mtl_base_module_t *mtl)
if (0 == ompi_mtl_portals4.need_init) { if (0 == ompi_mtl_portals4.need_init) {
opal_progress_unregister(ompi_mtl_portals4_progress); opal_progress_unregister(ompi_mtl_portals4_progress);
while (0 != ompi_mtl_portals4_progress()) { } while (0 != ompi_mtl_portals4_progress()) { }
}
#if OMPI_MTL_PORTALS4_FLOW_CONTROL #if OMPI_MTL_PORTALS4_FLOW_CONTROL
ompi_mtl_portals4_flowctl_fini(); ompi_mtl_portals4_flowctl_fini();
#endif #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)) { if (!PtlHandleIsEqual(ompi_mtl_portals4.long_overflow_me_h, PTL_INVALID_HANDLE)) {
PtlMEUnlink(ompi_mtl_portals4.long_overflow_me_h); PtlMEUnlink(ompi_mtl_portals4.long_overflow_me_h);

8
opal/mca/btl/portals4/configure.m4
Просмотреть файл

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. 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 (c) 2014 Bull SAS. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
@ -44,9 +44,9 @@ AC_DEFUN([MCA_opal_btl_portals4_CONFIG],[
[AC_HELP_STRING([--enable-btl-portals4-flow-control], [AC_HELP_STRING([--enable-btl-portals4-flow-control],
[enable flow control for Portals 4 BTL (default: disabled)])]) [enable flow control for Portals 4 BTL (default: disabled)])])
AC_MSG_CHECKING([whether to enable flow control]) AC_MSG_CHECKING([whether to enable flow control])
if test "$enable_btl_portals4_flow_control" != "yes"; then if test "$enable_btl_portals4_flow_control" != "no"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([yes])
btl_portals4_flow_control_enabled=0 btl_portals4_flow_control_enabled=1
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
btl_portals4_flow_control_enabled=0 btl_portals4_flow_control_enabled=0