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

Update to latest PMIx master (v4.0)

Просмотр исходного кода 
Update the OPAL glue configure code to correctly link the opal/pmix4
component to the hwloc used by OMPI instead of defaulting to the
system-level hwloc. Required a corresponding update to the PMIx hwloc
configure code so we treat hwloc the same way we handle libevent in
embedded scenarios.

Signed-off-by: Ralph Castain <rhc@pmix.org>
Этот коммит содержится в:
Ralph Castain 2019-01-10 09:37:56 -08:00
родитель 78e9d01bdd
Коммит 1e70ea73f4
42 изменённых файлов: 1753 добавлений и 767 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
opal/mca/pmix/pmix4x/configure.m4
Просмотреть файл

@ -13,7 +13,7 @@
# Copyright (c) 2011-2013 Los Alamos National Security, LLC. # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved. # All rights reserved.
# Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved. # Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
# Copyright (c) 2015-2016 Research Organization for Information Science # Copyright (c) 2015-2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
@ -53,14 +53,14 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
opal_pmix_pmix4x_timing_flag=--disable-pmix-timing opal_pmix_pmix4x_timing_flag=--disable-pmix-timing
fi fi
opal_pmix_pmix4x_args="$opal_pmix_pmix4x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\"" opal_pmix_pmix4x_args="$opal_pmix_pmix4x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --enable-embedded-hwloc --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
AS_IF([test "$enable_debug" = "yes"], AS_IF([test "$enable_debug" = "yes"],
[opal_pmix_pmix4x_args="--enable-debug $opal_pmix_pmix4x_args" [opal_pmix_pmix4x_args="--enable-debug $opal_pmix_pmix4x_args"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"], CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
[opal_pmix_pmix4x_args="--disable-debug $opal_pmix_pmix4x_args" [opal_pmix_pmix4x_args="--disable-debug $opal_pmix_pmix4x_args"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"]) CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
AC_MSG_CHECKING([if want to install standalone libpmix]) AC_MSG_CHECKING([if want to install standalone libpmix])
AS_IF([test "$enable_install_libpmix" == "yes"], AS_IF([test "$enable_install_libpmix" = "yes"],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
opal_pmix_pmix4x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX4X_ --enable-embedded-mode $opal_pmix_pmix4x_args"]) opal_pmix_pmix4x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX4X_ --enable-embedded-mode $opal_pmix_pmix4x_args"])

6
opal/mca/pmix/pmix4x/pmix/VERSION
Просмотреть файл

@ -23,14 +23,14 @@ release=0
# The only requirement is that it must be entirely printable ASCII # The only requirement is that it must be entirely printable ASCII
# characters and have no white space. # characters and have no white space.
greek= greek=a1
# If repo_rev is empty, then the repository version number will be # If repo_rev is empty, then the repository version number will be
# obtained during "make dist" via the "git describe --tags --always" # obtained during "make dist" via the "git describe --tags --always"
# command, or with the date (if "git describe" fails) in the form of # command, or with the date (if "git describe" fails) in the form of
# "date<date>". # "date<date>".
repo_rev=gitfae0ee7d repo_rev=gitb5863c9c
# If tarball_version is not empty, it is used as the version string in # If tarball_version is not empty, it is used as the version string in
# the tarball filename, regardless of all other versions listed in # the tarball filename, regardless of all other versions listed in
@ -44,7 +44,7 @@ tarball_version=
# The date when this release was created # The date when this release was created
date="Dec 28, 2018" date="Jan 10, 2019"
# The shared library version of each of PMIx's public libraries. # The shared library version of each of PMIx's public libraries.
# These versions are maintained in accordance with the "Library # These versions are maintained in accordance with the "Library

5
opal/mca/pmix/pmix4x/pmix/config/pmix.m4
Просмотреть файл

@ -17,7 +17,7 @@ dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
dnl reserved. dnl reserved.
dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2009-2011 Oak Ridge National Labs. All rights reserved.
dnl Copyright (c) 2011-2013 NVIDIA Corporation. All rights reserved. dnl Copyright (c) 2011-2013 NVIDIA Corporation. All rights reserved.
dnl Copyright (c) 2013-2018 Intel, Inc. All rights reserved. dnl Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015-2017 Research Organization for Information Science dnl Copyright (c) 2015-2017 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl Copyright (c) 2016 Mellanox Technologies, Inc. dnl Copyright (c) 2016 Mellanox Technologies, Inc.
@ -415,7 +415,8 @@ AC_DEFUN([PMIX_SETUP_CORE],[
crt_externs.h signal.h \ crt_externs.h signal.h \
ioLib.h sockLib.h hostLib.h limits.h \ ioLib.h sockLib.h hostLib.h limits.h \
sys/statfs.h sys/statvfs.h \ sys/statfs.h sys/statvfs.h \
netdb.h ucred.h zlib.h sys/auxv.h]) netdb.h ucred.h zlib.h sys/auxv.h \
sys/sysctl.h])
AC_CHECK_HEADERS([sys/mount.h], [], [], AC_CHECK_HEADERS([sys/mount.h], [], [],
[AC_INCLUDES_DEFAULT [AC_INCLUDES_DEFAULT

9
opal/mca/pmix/pmix4x/pmix/config/pmix_check_os_flavors.m4
Просмотреть файл

@ -1,7 +1,7 @@
dnl -*- shell-script -*- dnl -*- shell-script -*-
dnl dnl
dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014-2016 Intel, Inc. All rights reserved. dnl Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
dnl Copyright (c) 2014 Research Organization for Information Science dnl Copyright (c) 2014 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl dnl
@ -57,6 +57,13 @@ AC_DEFUN([PMIX_CHECK_OS_FLAVORS],
[$pmix_have_solaris], [$pmix_have_solaris],
[Whether or not we have solaris]) [Whether or not we have solaris])
AS_IF([test "$pmix_found_apple" = "yes"],
[pmix_have_apple=1],
[pmix_have_apple=0])
AC_DEFINE_UNQUOTED([PMIX_HAVE_APPLE],
[$pmix_have_apple],
[Whether or not we have apple])
# check for sockaddr_in (a good sign we have TCP) # check for sockaddr_in (a good sign we have TCP)
AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h]) AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h])
AC_CHECK_TYPES([struct sockaddr_in], AC_CHECK_TYPES([struct sockaddr_in],

67
opal/mca/pmix/pmix4x/pmix/config/pmix_setup_hwloc.m4
Просмотреть файл

@ -2,7 +2,7 @@
# #
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved. # Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -13,6 +13,43 @@
# MCA_hwloc_CONFIG([action-if-found], [action-if-not-found]) # MCA_hwloc_CONFIG([action-if-found], [action-if-not-found])
# -------------------------------------------------------------------- # --------------------------------------------------------------------
AC_DEFUN([PMIX_HWLOC_CONFIG],[ AC_DEFUN([PMIX_HWLOC_CONFIG],[
AC_ARG_WITH([hwloc-header],
[AC_HELP_STRING([--with-hwloc-header=HEADER],
[The value that should be included in C files to include hwloc.h])])
AC_ARG_ENABLE([embedded-hwloc],
[AC_HELP_STRING([--enable-embedded-hwloc],
[Enable use of locally embedded hwloc])])
AS_IF([test "$enable_embedded_hwloc" = "yes"],
[_PMIX_HWLOC_EMBEDDED_MODE],
[_PMIX_HWLOC_EXTERNAL])
AC_MSG_CHECKING([hwloc header])
AC_DEFINE_UNQUOTED([PMIX_HWLOC_HEADER], [$PMIX_HWLOC_HEADER],
[Location of hwloc.h])
AC_MSG_RESULT([$PMIX_HWLOC_HEADER])
AC_DEFINE_UNQUOTED([PMIX_HAVE_HWLOC], [$pmix_hwloc_support],
[Whether or not we have hwloc support])
PMIX_SUMMARY_ADD([[External Packages]],[[HWLOC]], [pmix_hwloc], [$pmix_hwloc_support_will_build ($pmix_hwloc_source)])
])
AC_DEFUN([_PMIX_HWLOC_EMBEDDED_MODE],[
AC_MSG_CHECKING([for hwloc])
AC_MSG_RESULT([assumed available (embedded mode)])
AS_IF([test -z "$with_hwloc_header" || test "$with_hwloc_header" = "yes"],
[PMIX_HWLOC_HEADER="<hwloc.h>"],
[PMIX_HWLOC_HEADER="$with_hwloc_header"])
pmix_hwloc_support=1
pmix_hwloc_source=embedded
pmix_hwloc_support_will_build=yes
])
AC_DEFUN([_PMIX_HWLOC_EXTERNAL],[
PMIX_VAR_SCOPE_PUSH([pmix_hwloc_dir pmix_hwloc_libdir pmix_hwloc_standard_lib_location pmix_hwloc_standard_header_location]) PMIX_VAR_SCOPE_PUSH([pmix_hwloc_dir pmix_hwloc_libdir pmix_hwloc_standard_lib_location pmix_hwloc_standard_header_location])
AC_ARG_WITH([hwloc], AC_ARG_WITH([hwloc],
@ -62,18 +99,13 @@ AC_DEFUN([PMIX_HWLOC_CONFIG],[
[$pmix_hwloc_libdir], [$pmix_hwloc_libdir],
[pmix_hwloc_support=1], [pmix_hwloc_support=1],
[pmix_hwloc_support=0]) [pmix_hwloc_support=0])
if test $pmix_hwloc_support = "1"; then
LIBS="$LIBS -lhwloc" AS_IF([test "$pmix_hwloc_standard_header_location" != "yes"],
PMIX_EMBEDDED_LIBS="$PMIX_EMBEDDED_LIBS -lhwloc" [PMIX_FLAGS_APPEND_UNIQ(CPPFLAGS, $pmix_hwloc_CPPFLAGS)])
if test "$pmix_hwloc_standard_header_location" != "yes"; then
PMIX_EMBEDDED_CPPFLAGS="$PMIX_EMBEDDED_CPPFLAGS $pmix_hwloc_CPPFLAGS" AS_IF([test "$pmix_hwloc_standard_lib_location" != "yes"],
CPPFLAGS="$CPPFLAGS $pmix_hwloc_CPPFLAGS" [PMIX_FLAGS_APPEND_UNIQ(LIBS, $pmix_hwloc_LIBS)
fi PMIX_FLAGS_APPEND_UNIQ(LDFLAGS, $pmix_hwloc_LDFLAGS)])
if test "$pmix_hwloc_standard_lib_location" != "yes"; then
PMIX_EMBEDDED_LDFLAGS="$PMIX_EMBEDDED_LDFLAGS $pmix_hwloc_LDFLAGS"
LDFLAGS="$LDFLAGS $pmix_hwloc_LDFLAGS"
fi
fi
fi fi
if test ! -z "$with_hwloc" && test "$with_hwloc" != "no" && test "$pmix_hwloc_support" != "1"; then if test ! -z "$with_hwloc" && test "$with_hwloc" != "no" && test "$pmix_hwloc_support" != "1"; then
@ -98,11 +130,16 @@ AC_DEFUN([PMIX_HWLOC_CONFIG],[
AC_MSG_CHECKING([will hwloc support be built]) AC_MSG_CHECKING([will hwloc support be built])
if test "$pmix_hwloc_support" != "1"; then if test "$pmix_hwloc_support" != "1"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
pmix_hwloc_source=none
pmix_hwloc_support_will_build=no
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
pmix_hwloc_source=$pmix_hwloc_dir
pmix_hwloc_support_will_build=yes
fi fi
AC_DEFINE_UNQUOTED([PMIX_HAVE_HWLOC], [$pmix_hwloc_support], # Set output variables
[Whether or not we have hwloc support]) PMIX_HWLOC_HEADER="<hwloc.h>"
PMIX_VAR_SCOPE_POP PMIX_VAR_SCOPE_POP
])dnl ])dnl

6
opal/mca/pmix/pmix4x/pmix/config/pmix_setup_libevent.m4
Просмотреть файл

@ -2,7 +2,7 @@
# #
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved. # Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science # Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
@ -35,6 +35,8 @@ AC_DEFUN([PMIX_LIBEVENT_CONFIG],[
AC_DEFINE_UNQUOTED([PMIX_EVENT2_THREAD_HEADER], [$PMIX_EVENT2_THREAD_HEADER], AC_DEFINE_UNQUOTED([PMIX_EVENT2_THREAD_HEADER], [$PMIX_EVENT2_THREAD_HEADER],
[Location of event2/thread.h]) [Location of event2/thread.h])
AC_MSG_RESULT([$PMIX_EVENT2_THREAD_HEADER]) AC_MSG_RESULT([$PMIX_EVENT2_THREAD_HEADER])
PMIX_SUMMARY_ADD([[External Packages]],[[Libevent]], [pmix_libevent], [yes ($pmix_libevent_source)])
]) ])
AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[ AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
@ -47,6 +49,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
[PMIX_EVENT_HEADER="$with_libevent_header" [PMIX_EVENT_HEADER="$with_libevent_header"
PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"]) PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"])
pmix_libevent_source=embedded
]) ])
AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
@ -138,6 +141,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
# Set output variables # Set output variables
PMIX_EVENT_HEADER="<event.h>" PMIX_EVENT_HEADER="<event.h>"
PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>" PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"
pmix_libevent_source=$pmix_event_dir
PMIX_VAR_SCOPE_POP PMIX_VAR_SCOPE_POP
])dnl ])dnl

4
opal/mca/pmix/pmix4x/pmix/contrib/pmix.spec
Просмотреть файл

@ -12,7 +12,7 @@
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013 Mellanox Technologies, Inc. # Copyright (c) 2013 Mellanox Technologies, Inc.
# All rights reserved. # All rights reserved.
# Copyright (c) 2015-2018 Intel, Inc. All rights reserved. # Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
# Copyright (c) 2015 Research Organization for Information Science # Copyright (c) 2015 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
@ -192,7 +192,7 @@
Summary: An extended/exascale implementation of PMI Summary: An extended/exascale implementation of PMI
Name: %{?_name:%{_name}}%{!?_name:pmix} Name: %{?_name:%{_name}}%{!?_name:pmix}
Version: 4.0.0 Version: 4.0.0a1
Release: 1%{?dist} Release: 1%{?dist}
License: BSD License: BSD
Group: Development/Libraries Group: Development/Libraries

33
opal/mca/pmix/pmix4x/pmix/examples/Makefile.am
Просмотреть файл

@ -11,13 +11,14 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. # Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved. # Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
# #
# $HEADER$ # $HEADER$
# #
headers = examples.h
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix
@ -28,64 +29,64 @@ if !WANT_HIDDEN
noinst_PROGRAMS += server noinst_PROGRAMS += server
endif endif
client_SOURCES = client.c client_SOURCES = client.c examples.h
client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) client_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
client_LDADD = $(top_builddir)/src/libpmix.la client_LDADD = $(top_builddir)/src/libpmix.la
client2_SOURCES = client2.c client2_SOURCES = client2.c examples.h
client2_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) client2_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
client2_LDADD = $(top_builddir)/src/libpmix.la client2_LDADD = $(top_builddir)/src/libpmix.la
debugger_SOURCES = debugger.c debugger_SOURCES = debugger.c examples.h
debugger_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) debugger_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
debugger_LDADD = $(top_builddir)/src/libpmix.la debugger_LDADD = $(top_builddir)/src/libpmix.la
debuggerd_SOURCES = debuggerd.c debuggerd_SOURCES = debuggerd.c examples.h
debuggerd_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) debuggerd_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
debuggerd_LDADD = $(top_builddir)/src/libpmix.la debuggerd_LDADD = $(top_builddir)/src/libpmix.la
alloc_SOURCES = alloc.c alloc_SOURCES = alloc.c examples.h
alloc_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) alloc_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
alloc_LDADD = $(top_builddir)/src/libpmix.la alloc_LDADD = $(top_builddir)/src/libpmix.la
jctrl_SOURCES = jctrl.c jctrl_SOURCES = jctrl.c examples.h
jctrl_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) jctrl_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
jctrl_LDADD = $(top_builddir)/src/libpmix.la jctrl_LDADD = $(top_builddir)/src/libpmix.la
dmodex_SOURCES = dmodex.c dmodex_SOURCES = dmodex.c examples.h
dmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) dmodex_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
dmodex_LDADD = $(top_builddir)/src/libpmix.la dmodex_LDADD = $(top_builddir)/src/libpmix.la
dynamic_SOURCES = dynamic.c dynamic_SOURCES = dynamic.c examples.h
dynamic_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) dynamic_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
dynamic_LDADD = $(top_builddir)/src/libpmix.la dynamic_LDADD = $(top_builddir)/src/libpmix.la
fault_SOURCES = fault.c fault_SOURCES = fault.c examples.h
fault_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) fault_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
fault_LDADD = $(top_builddir)/src/libpmix.la fault_LDADD = $(top_builddir)/src/libpmix.la
pub_SOURCES = pub.c pub_SOURCES = pub.c examples.h
pub_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) pub_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
pub_LDADD = $(top_builddir)/src/libpmix.la pub_LDADD = $(top_builddir)/src/libpmix.la
pubi_SOURCES = pubi.c pubi_SOURCES = pubi.c examples.h
pubi_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) pubi_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
pubi_LDADD = $(top_builddir)/src/libpmix.la pubi_LDADD = $(top_builddir)/src/libpmix.la
tool_SOURCES = tool.c tool_SOURCES = tool.c examples.h
tool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) tool_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
tool_LDADD = $(top_builddir)/src/libpmix.la tool_LDADD = $(top_builddir)/src/libpmix.la
group_SOURCES = group.c group_SOURCES = group.c examples.h
group_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) group_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
group_LDADD = $(top_builddir)/src/libpmix.la group_LDADD = $(top_builddir)/src/libpmix.la
asyncgroup_SOURCES = asyncgroup.c asyncgroup_SOURCES = asyncgroup.c examples.h
asyncgroup_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) asyncgroup_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
asyncgroup_LDADD = $(top_builddir)/src/libpmix.la asyncgroup_LDADD = $(top_builddir)/src/libpmix.la
if !WANT_HIDDEN if !WANT_HIDDEN
server_SOURCES = server.c server_SOURCES = server.c examples.h
server_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS) server_LDFLAGS = $(PMIX_PKG_CONFIG_LDFLAGS)
server_LDADD = $(top_builddir)/src/libpmix.la server_LDADD = $(top_builddir)/src/libpmix.la
endif endif

133
opal/mca/pmix/pmix4x/pmix/examples/alloc.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -30,16 +30,7 @@
#include <time.h> #include <time.h>
#include <pmix.h> #include <pmix.h>
#include "examples.h"
/* define a structure for collecting returned
* info from an allocation request */
typedef struct {
volatile bool active;
pmix_info_t *info;
size_t ninfo;
} mydata_t;
static volatile bool waiting_for_allocation = true;
/* this is a callback function for the PMIx_Query and /* this is a callback function for the PMIx_Query and
* PMIx_Allocate APIs. The query will callback with a status indicating * PMIx_Allocate APIs. The query will callback with a status indicating
@ -59,7 +50,7 @@ static void infocbfunc(pmix_status_t status,
pmix_release_cbfunc_t release_fn, pmix_release_cbfunc_t release_fn,
void *release_cbdata) void *release_cbdata)
{ {
mydata_t *mq = (mydata_t*)cbdata; myquery_data_t *mq = (myquery_data_t*)cbdata;
size_t n; size_t n;
fprintf(stderr, "Allocation request returned %s", PMIx_Error_string(status)); fprintf(stderr, "Allocation request returned %s", PMIx_Error_string(status));
@ -75,6 +66,9 @@ static void infocbfunc(pmix_status_t status,
PMIX_INFO_XFER(&mq->info[n], &info[n]); PMIX_INFO_XFER(&mq->info[n], &info[n]);
} }
} }
/* the status returned here indicates whether the requested
* information was found or not - preserve it */
mq->lock.status = status;
/* let the library release the data and cleanup from /* let the library release the data and cleanup from
* the operation */ * the operation */
@ -83,7 +77,7 @@ static void infocbfunc(pmix_status_t status,
} }
/* release the block */ /* release the block */
mq->active = false; DEBUG_WAKEUP_THREAD(&mq->lock);
} }
/* this is an event notification function that we explicitly request /* this is an event notification function that we explicitly request
@ -100,12 +94,37 @@ static void release_fn(size_t evhdlr_registration_id,
pmix_event_notification_cbfunc_fn_t cbfunc, pmix_event_notification_cbfunc_fn_t cbfunc,
void *cbdata) void *cbdata)
{ {
myrel_t *lock;
size_t n;
/* find the return object */
lock = NULL;
for (n=0; n < ninfo; n++) {
if (0 == strncmp(info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
lock = (myrel_t*)info[n].value.data.ptr;
break;
}
}
/* if the object wasn't returned, then that is an error */
if (NULL == lock) {
fprintf(stderr, "LOCK WASN'T RETURNED IN RELEASE CALLBACK\n");
/* let the event handler progress */
if (NULL != cbfunc) {
cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
}
return;
}
/* tell the event handler state machine that we are the last step */ /* tell the event handler state machine that we are the last step */
if (NULL != cbfunc) { if (NULL != cbfunc) {
cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata); cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
} }
/* flag that the allocation is complete so we can exit */ /* the status will be PMIX_ERR_ALLOC_COMPLETE since that is the code
waiting_for_allocation = false; * we registered to receive. The result of the allocation request is
* in the info array - for now, just assume success */
lock->lock.status = PMIX_SUCCESS;
/* release the lock */
DEBUG_WAKEUP_THREAD(&lock->lock);
} }
/* event handler registration is done asynchronously because it /* event handler registration is done asynchronously because it
@ -114,18 +133,20 @@ static void release_fn(size_t evhdlr_registration_id,
* the status of the request (success or an error), plus a numerical index * the status of the request (success or an error), plus a numerical index
* to the registered event. The index is used later on to deregister * to the registered event. The index is used later on to deregister
* an event handler - if we don't explicitly deregister it, then the * an event handler - if we don't explicitly deregister it, then the
* PMIx server will do so when it see us exit */ * PMIx server will do so when it sees us exit */
static void evhandler_reg_callbk(pmix_status_t status, static void evhandler_reg_callbk(pmix_status_t status,
size_t evhandler_ref, size_t evhandler_ref,
void *cbdata) void *cbdata)
{ {
volatile int *active = (volatile int*)cbdata; mylock_t *lock = (mylock_t*)cbdata;
if (PMIX_SUCCESS != status) { if (PMIX_SUCCESS != status) {
fprintf(stderr, "EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n", fprintf(stderr, "EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
status, (unsigned long)evhandler_ref); status, (unsigned long)evhandler_ref);
} }
*active = status; lock->status = status;
lock->evhandler_ref = evhandler_ref;
DEBUG_WAKEUP_THREAD(lock);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
@ -138,11 +159,12 @@ int main(int argc, char **argv)
uint32_t nprocs; uint32_t nprocs;
pmix_info_t *info; pmix_info_t *info;
uint64_t nnodes = 12; uint64_t nnodes = 12;
mydata_t mydata; myquery_data_t mydata;
pmix_query_t *query; pmix_query_t *query;
char *myallocation = "MYALLOCATION"; char *myallocation = "MYALLOCATION";
volatile int active; mylock_t mylock;
pmix_status_t code = PMIX_NOTIFY_ALLOC_COMPLETE; pmix_status_t code;
myrel_t myrel;
/* init us */ /* init us */
if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) { if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
@ -163,63 +185,64 @@ int main(int argc, char **argv)
PMIX_VALUE_RELEASE(val); PMIX_VALUE_RELEASE(val);
fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs); fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
/* initialize the return info struct */
mydata.info = NULL;
mydata.ninfo = 0;
if (0 == myproc.rank) { if (0 == myproc.rank) {
/* try to get an allocation */ /* try to get an allocation */
mydata.active = true; DEBUG_CONSTRUCT_MYQUERY(&mydata);
PMIX_INFO_CREATE(info, 2); PMIX_INFO_CREATE(info, 2);
PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_NUM_NODES, &nnodes, PMIX_UINT64); PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_NUM_NODES, &nnodes, PMIX_UINT64);
PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING); PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING);
if (PMIX_SUCCESS != (rc = PMIx_Allocation_request_nb(PMIX_ALLOC_NEW, info, 2, infocbfunc, NULL))) { if (PMIX_SUCCESS != (rc = PMIx_Allocation_request_nb(PMIX_ALLOC_NEW, info, 2, infocbfunc, &mydata))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Allocation_request_nb failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Allocation_request_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
goto done; goto done;
} }
while (mydata.active) { DEBUG_WAIT_THREAD(&mydata.lock);
usleep(10);
}
PMIX_INFO_FREE(info, 2); PMIX_INFO_FREE(info, 2);
if (NULL != mydata.info) { fprintf(stderr, "Client ns %s rank %d: Allocation returned status: %s\n",
PMIX_INFO_FREE(mydata.info, mydata.ninfo); myproc.nspace, myproc.rank, PMIx_Error_string(mydata.lock.status));
} DEBUG_DESTRUCT_MYQUERY(&mydata);
} else if (1 == myproc.rank) { } else if (1 == myproc.rank) {
/* register a handler specifically for when the allocation /* demonstrate a notification based approach - register a handler
* operation completes */ * specifically for when the allocation operation completes */
PMIX_INFO_CREATE(info, 1); DEBUG_CONSTRUCT_MYREL(&myrel);
PMIX_INFO_CREATE(info, 2);
PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING); PMIX_INFO_LOAD(&info[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING);
active = -1; PMIX_INFO_LOAD(&info[1], PMIX_EVENT_RETURN_OBJECT, &myrel, PMIX_POINTER);
PMIx_Register_event_handler(&code, 1, info, 1, DEBUG_CONSTRUCT_LOCK(&mylock);
release_fn, evhandler_reg_callbk, (void*)&active); code = PMIX_NOTIFY_ALLOC_COMPLETE;
while (-1 == active) { PMIx_Register_event_handler(&code, 1, info, 2,
usleep(10); release_fn, evhandler_reg_callbk, (void*)&mylock);
} DEBUG_WAIT_THREAD(&mylock);
if (0 != active) { PMIX_INFO_FREE(info, 2);
exit(active); rc = mylock.status;
} DEBUG_DESTRUCT_LOCK(&mylock);
PMIX_INFO_FREE(info, 1);
/* now wait to hear that the request is complete */ /* now wait to hear that the request is complete */
while (waiting_for_allocation) { DEBUG_WAIT_THREAD(&myrel.lock);
usleep(10); fprintf(stderr, "[%s:%d] Allocation returned status: %s\n",
} myproc.nspace, myproc.rank, PMIx_Error_string(myrel.lock.status));
DEBUG_DESTRUCT_MYREL(&myrel);
} else { } else {
/* I am not the root rank, so let me wait a little while and then /* demonstrate a query-based approach - wait a little while and ask to
* query the status of the allocation request */ * see if it was done */
usleep(10); usleep(10);
DEBUG_CONSTRUCT_MYQUERY(&mydata);
PMIX_QUERY_CREATE(query, 1); PMIX_QUERY_CREATE(query, 1);
PMIX_ARGV_APPEND(rc, query[0].keys, PMIX_QUERY_ALLOC_STATUS); PMIX_ARGV_APPEND(rc, query[0].keys, PMIX_QUERY_ALLOC_STATUS);
PMIX_INFO_CREATE(query[0].qualifiers, 1); PMIX_INFO_CREATE(query[0].qualifiers, 1);
PMIX_INFO_LOAD(&query[0].qualifiers[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING); PMIX_INFO_LOAD(&query[0].qualifiers[0], PMIX_ALLOC_ID, myallocation, PMIX_STRING);
mydata.active = true;
if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, 1, infocbfunc, (void*)&mydata))) { if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, 1, infocbfunc, (void*)&mydata))) {
fprintf(stderr, "PMIx_Query_info failed: %d\n", rc); fprintf(stderr, "PMIx_Query_info failed: %d\n", rc);
goto done; goto done;
} }
while (mydata.active) { DEBUG_WAIT_THREAD(&mydata.lock);
usleep(10);
}
PMIX_QUERY_FREE(query, 1); PMIX_QUERY_FREE(query, 1);
fprintf(stderr, "[%s:%d] Allocation returned status: %s\n",
myproc.nspace, myproc.rank, PMIx_Error_string(mydata.lock.status));
DEBUG_DESTRUCT_MYQUERY(&mydata);
} }
done: done:

216
opal/mca/pmix/pmix4x/pmix/examples/client.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -31,8 +31,8 @@
#include <time.h> #include <time.h>
#include <pmix.h> #include <pmix.h>
#include "examples.h"
static volatile bool waiting_for_debugger = true;
static pmix_proc_t myproc; static pmix_proc_t myproc;
/* this is the event notification function we pass down below /* this is the event notification function we pass down below
@ -66,10 +66,36 @@ static void release_fn(size_t evhdlr_registration_id,
pmix_event_notification_cbfunc_fn_t cbfunc, pmix_event_notification_cbfunc_fn_t cbfunc,
void *cbdata) void *cbdata)
{ {
myrel_t *lock;
size_t n;
/* find the return object */
lock = NULL;
for (n=0; n < ninfo; n++) {
if (0 == strncmp(info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
lock = (myrel_t*)info[n].value.data.ptr;
break;
}
}
/* if the object wasn't returned, then that is an error */
if (NULL == lock) {
fprintf(stderr, "LOCK WASN'T RETURNED IN RELEASE CALLBACK\n");
/* let the event handler progress */
if (NULL != cbfunc) {
cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
}
return;
}
/* tell the event handler state machine that we are the last step */
if (NULL != cbfunc) { if (NULL != cbfunc) {
cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata); cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
} }
waiting_for_debugger = false; /* the status will be PMIX_ERR_DEBUGGER_RELEASE since that is the code
* we registered to receive, so just return success */
lock->lock.status = PMIX_SUCCESS;
/* release the lock */
DEBUG_WAKEUP_THREAD(&lock->lock);
} }
/* event handler registration is done asynchronously because it /* event handler registration is done asynchronously because it
@ -83,27 +109,34 @@ static void evhandler_reg_callbk(pmix_status_t status,
size_t evhandler_ref, size_t evhandler_ref,
void *cbdata) void *cbdata)
{ {
volatile int *active = (volatile int*)cbdata; mylock_t *lock = (mylock_t*)cbdata;
if (PMIX_SUCCESS != status) { if (PMIX_SUCCESS != status) {
fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n", fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref); myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref);
} }
*active = status; lock->status = status;
lock->evhandler_ref = evhandler_ref;
DEBUG_WAKEUP_THREAD(lock);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int rc; pmix_status_t rc;
pmix_value_t value; pmix_value_t value;
pmix_value_t *val = &value; pmix_value_t *val = &value;
char *tmp, *ptr, *p; char *tmp;
pmix_proc_t proc; pmix_proc_t proc;
uint32_t nprocs, m, n, local_cnt, *localpeers; uint32_t nprocs, n;
pmix_info_t *info; pmix_info_t *info;
bool flag, local; bool flag;
volatile int active; mylock_t mylock;
myrel_t myrel;
pmix_status_t dbg = PMIX_ERR_DEBUGGER_RELEASE; pmix_status_t dbg = PMIX_ERR_DEBUGGER_RELEASE;
pid_t pid;
pid = getpid();
fprintf(stderr, "Client %lu: Running\n", (unsigned long)pid);
/* init us - note that the call to "init" includes the return of /* init us - note that the call to "init" includes the return of
* any job-related info provided by the RM. This includes any * any job-related info provided by the RM. This includes any
@ -114,20 +147,21 @@ int main(int argc, char **argv)
fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Init failed: %d\n", myproc.nspace, myproc.rank, rc);
exit(0); exit(0);
} }
fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank); fprintf(stderr, "Client ns %s rank %d pid %lu: Running\n", myproc.nspace, myproc.rank, (unsigned long)pid);
/* register our default event handler - again, this isn't strictly /* register our default event handler - again, this isn't strictly
* required, but is generally good practice */ * required, but is generally good practice */
active = -1; DEBUG_CONSTRUCT_LOCK(&mylock);
PMIx_Register_event_handler(NULL, 0, NULL, 0, PMIx_Register_event_handler(NULL, 0, NULL, 0,
notification_fn, evhandler_reg_callbk, (void*)&active); notification_fn, evhandler_reg_callbk, (void*)&mylock);
while (-1 == active) { DEBUG_WAIT_THREAD(&mylock);
sleep(1); rc = mylock.status;
} DEBUG_DESTRUCT_LOCK(&mylock);
if (0 != active) {
if (PMIX_SUCCESS != rc) {
fprintf(stderr, "[%s:%d] Default handler registration failed\n", myproc.nspace, myproc.rank); fprintf(stderr, "[%s:%d] Default handler registration failed\n", myproc.nspace, myproc.rank);
exit(active); goto done;
} }
/* job-related info is found in our nspace, assigned to the /* job-related info is found in our nspace, assigned to the
@ -145,21 +179,24 @@ int main(int argc, char **argv)
* debugger */ * debugger */
if (PMIX_SUCCESS == (rc = PMIx_Get(&proc, PMIX_DEBUG_WAIT_FOR_NOTIFY, NULL, 0, &val))) { if (PMIX_SUCCESS == (rc = PMIx_Get(&proc, PMIX_DEBUG_WAIT_FOR_NOTIFY, NULL, 0, &val))) {
/* register for debugger release */ /* register for debugger release */
active = -1; DEBUG_CONSTRUCT_LOCK(&mylock);
PMIx_Register_event_handler(&dbg, 1, NULL, 0, PMIX_INFO_CREATE(info, 1);
release_fn, evhandler_reg_callbk, (void*)&active); DEBUG_CONSTRUCT_MYREL(&myrel);
PMIX_INFO_LOAD(&info[0], PMIX_EVENT_RETURN_OBJECT, &myrel, PMIX_POINTER);
PMIx_Register_event_handler(&dbg, 1, info, 1,
release_fn, evhandler_reg_callbk, (void*)&mylock);
/* wait for registration to complete */ /* wait for registration to complete */
while (-1 == active) { DEBUG_WAIT_THREAD(&mylock);
sleep(1); rc = mylock.status;
} DEBUG_DESTRUCT_LOCK(&mylock);
if (0 != active) { PMIX_INFO_FREE(info, 1);
if (PMIX_SUCCESS != rc) {
fprintf(stderr, "[%s:%d] Debug handler registration failed\n", myproc.nspace, myproc.rank); fprintf(stderr, "[%s:%d] Debug handler registration failed\n", myproc.nspace, myproc.rank);
exit(active); goto done;
} }
/* wait for debugger release */ /* wait for debugger release */
while (waiting_for_debugger) { DEBUG_WAIT_THREAD(&myrel.lock);
sleep(1); DEBUG_DESTRUCT_MYREL(&myrel);
}
} }
/* get our universe size */ /* get our universe size */
@ -196,7 +233,7 @@ int main(int argc, char **argv)
value.type = PMIX_UINT64; value.type = PMIX_UINT64;
value.data.uint64 = 1234; value.data.uint64 = 1234;
if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_LOCAL, tmp, &value))) { if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_LOCAL, tmp, &value))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Put local failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Put internal failed: %d\n", myproc.nspace, myproc.rank, rc);
goto done; goto done;
} }
free(tmp); free(tmp);
@ -207,7 +244,7 @@ int main(int argc, char **argv)
value.type = PMIX_STRING; value.type = PMIX_STRING;
value.data.string = "1234"; value.data.string = "1234";
if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_REMOTE, tmp, &value))) { if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_REMOTE, tmp, &value))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Put remote failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Put internal failed: %d\n", myproc.nspace, myproc.rank, rc);
goto done; goto done;
} }
free(tmp); free(tmp);
@ -230,96 +267,53 @@ int main(int argc, char **argv)
} }
PMIX_INFO_FREE(info, 1); PMIX_INFO_FREE(info, 1);
/* get the number of local peers */
if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_LOCAL_SIZE, NULL, 0, &val))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get PMIX_LOCAL_SIZE failed: %d", myproc.nspace, myproc.rank, rc);
goto done;
}
local_cnt = val->data.uint32;
PMIX_VALUE_RELEASE(val);
/* create an array for the peers */
localpeers = (uint32_t*)malloc(local_cnt * sizeof(int));
/* get the list of local peers */
if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_LOCAL_PEERS, NULL, 0, &val))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get PMIX_LOCAL_PEERS failed: %d", myproc.nspace, myproc.rank, rc);
goto done;
}
ptr = strdup(val->data.string);
PMIX_VALUE_RELEASE(val);
/* populate the peers array */
p = strtok(ptr, ",");
localpeers[0] = strtoul(p, NULL, 10);
for (n=1; n < local_cnt; n++) {
p = strtok(NULL, ",");
localpeers[n] = strtoul(p, NULL, 10);
}
free(ptr);
/* check the returned data */ /* check the returned data */
for (n=0; n < nprocs; n++) { for (n=0; n < nprocs; n++) {
if (n == myproc.rank) { if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank)) {
continue; exit(1);
} }
proc.rank = n; if (PMIX_SUCCESS != (rc = PMIx_Get(&myproc, tmp, NULL, 0, &val))) {
local = false; fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, myproc.rank, tmp, rc);
for (m=0; m < local_cnt; m++) { goto done;
if (localpeers[m] == proc.rank) {
local = true;
break;
}
} }
if (local) { if (PMIX_UINT64 != val->type) {
if (0 > asprintf(&tmp, "%s-%d-local", proc.nspace, proc.rank)) { fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong type: %d\n", myproc.nspace, myproc.rank, tmp, val->type);
exit(1);
}
if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, tmp, NULL, 0, &val))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, myproc.rank, tmp, rc);
goto done;
}
if (PMIX_UINT64 != val->type) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong type: %d\n", myproc.nspace, myproc.rank, tmp, val->type);
PMIX_VALUE_RELEASE(val);
free(tmp);
goto done;
}
if (1234 != val->data.uint64) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong value: %d\n", myproc.nspace, myproc.rank, tmp, (int)val->data.uint64);
PMIX_VALUE_RELEASE(val);
free(tmp);
goto done;
}
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned correct\n", myproc.nspace, myproc.rank, tmp);
PMIX_VALUE_RELEASE(val); PMIX_VALUE_RELEASE(val);
free(tmp); free(tmp);
} else { goto done;
if (0 > asprintf(&tmp, "%s-%d-remote", proc.nspace, proc.rank)) { }
exit(1); if (1234 != val->data.uint64) {
} fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong value: %d\n", myproc.nspace, myproc.rank, tmp, (int)val->data.uint64);
if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, tmp, NULL, 0, &val))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, myproc.rank, tmp, rc);
goto done;
}
if (PMIX_STRING != val->type) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong type: %d\n", myproc.nspace, myproc.rank, tmp, val->type);
PMIX_VALUE_RELEASE(val);
free(tmp);
goto done;
}
if (0 != strcmp(val->data.string, "1234")) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong value: %s\n", myproc.nspace, myproc.rank, tmp, val->data.string);
PMIX_VALUE_RELEASE(val);
free(tmp);
goto done;
}
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned correct\n", myproc.nspace, myproc.rank, tmp);
PMIX_VALUE_RELEASE(val); PMIX_VALUE_RELEASE(val);
free(tmp); free(tmp);
goto done;
} }
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned correct\n", myproc.nspace, myproc.rank, tmp);
PMIX_VALUE_RELEASE(val);
free(tmp);
if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank)) {
exit(1);
}
if (PMIX_SUCCESS != (rc = PMIx_Get(&myproc, tmp, NULL, 0, &val))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, myproc.rank, tmp, rc);
goto done;
}
if (PMIX_STRING != val->type) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong type: %d\n", myproc.nspace, myproc.rank, tmp, val->type);
PMIX_VALUE_RELEASE(val);
free(tmp);
goto done;
}
if (0 != strcmp(val->data.string, "1234")) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned wrong value: %s\n", myproc.nspace, myproc.rank, tmp, val->data.string);
PMIX_VALUE_RELEASE(val);
free(tmp);
goto done;
}
fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned correct\n", myproc.nspace, myproc.rank, tmp);
PMIX_VALUE_RELEASE(val);
free(tmp);
} }
free(localpeers);
done: done:
/* finalize us */ /* finalize us */

28
opal/mca/pmix/pmix4x/pmix/examples/client2.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -31,6 +31,7 @@
#include <time.h> #include <time.h>
#include <pmix.h> #include <pmix.h>
#include "examples.h"
static pmix_proc_t myproc; static pmix_proc_t myproc;
@ -62,25 +63,27 @@ static void evhandler_reg_callbk(pmix_status_t status,
size_t evhandler_ref, size_t evhandler_ref,
void *cbdata) void *cbdata)
{ {
volatile int *active = (volatile int*)cbdata; mylock_t *lock = (mylock_t*)cbdata;
if (PMIX_SUCCESS != status) { if (PMIX_SUCCESS != status) {
fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n", fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref); myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref);
} }
*active = status; lock->status = status;
lock->evhandler_ref = evhandler_ref;
DEBUG_WAKEUP_THREAD(lock);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int rc; pmix_status_t rc;
pmix_value_t value; pmix_value_t value;
pmix_value_t *val, *vptr; pmix_value_t *val, *vptr;
pmix_proc_t proc; pmix_proc_t proc;
uint32_t nprocs, n, k; uint32_t nprocs, n, k;
pmix_info_t *info; pmix_info_t *info;
bool flag; bool flag;
volatile int active; mylock_t mylock;
pmix_data_array_t da, *dptr; pmix_data_array_t da, *dptr;
/* init us - note that the call to "init" includes the return of /* init us - note that the call to "init" includes the return of
@ -97,15 +100,16 @@ int main(int argc, char **argv)
/* register our default event handler - again, this isn't strictly /* register our default event handler - again, this isn't strictly
* required, but is generally good practice */ * required, but is generally good practice */
active = -1; DEBUG_CONSTRUCT_LOCK(&mylock);
PMIx_Register_event_handler(NULL, 0, NULL, 0, PMIx_Register_event_handler(NULL, 0, NULL, 0,
notification_fn, evhandler_reg_callbk, (void*)&active); notification_fn, evhandler_reg_callbk, (void*)&mylock);
while (-1 == active) { DEBUG_WAIT_THREAD(&mylock);
sleep(1); rc = mylock.status;
} DEBUG_DESTRUCT_LOCK(&mylock);
if (0 != active) {
if (PMIX_SUCCESS != rc) {
fprintf(stderr, "[%s:%d] Default handler registration failed\n", myproc.nspace, myproc.rank); fprintf(stderr, "[%s:%d] Default handler registration failed\n", myproc.nspace, myproc.rank);
exit(active); goto done;
} }
/* job-related info is found in our nspace, assigned to the /* job-related info is found in our nspace, assigned to the

24
opal/mca/pmix/pmix4x/pmix/examples/dmodex.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -33,24 +33,19 @@
#include <time.h> #include <time.h>
#include <pmix.h> #include <pmix.h>
#include "examples.h"
static uint32_t nprocs; static uint32_t nprocs;
static pmix_proc_t myproc; static pmix_proc_t myproc;
static uint32_t getcount = 0; static uint32_t getcount = 0;
#define WAIT_FOR_COMPLETION(a) \
do { \
while ((a)) { \
usleep(10); \
} \
} while (0)
static void opcbfunc(pmix_status_t status, void *cbdata) static void opcbfunc(pmix_status_t status, void *cbdata)
{ {
bool *active = (bool*)cbdata; mylock_t *lock = (mylock_t*)cbdata;
fprintf(stderr, "%s:%d completed fence_nb\n", myproc.nspace, myproc.rank); fprintf(stderr, "%s:%d completed fence_nb\n", myproc.nspace, myproc.rank);
*active = false; lock->status = status;
DEBUG_WAKEUP_THREAD(lock);
} }
static void valcbfunc(pmix_status_t status, static void valcbfunc(pmix_status_t status,
@ -98,7 +93,7 @@ int main(int argc, char **argv)
char *tmp; char *tmp;
pmix_proc_t proc; pmix_proc_t proc;
uint32_t n, num_gets; uint32_t n, num_gets;
bool active; mylock_t mylock;
/* init us */ /* init us */
if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) { if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
@ -170,9 +165,10 @@ int main(int argc, char **argv)
PMIX_PROC_CONSTRUCT(&proc); PMIX_PROC_CONSTRUCT(&proc);
(void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN); (void)strncpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
proc.rank = PMIX_RANK_WILDCARD; proc.rank = PMIX_RANK_WILDCARD;
active = true; DEBUG_CONSTRUCT_LOCK(&mylock);
if (PMIX_SUCCESS != (rc = PMIx_Fence_nb(&proc, 1, NULL, 0, opcbfunc, &active))) { if (PMIX_SUCCESS != (rc = PMIx_Fence_nb(&proc, 1, NULL, 0, opcbfunc, &mylock))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Fence failed: %d\n", myproc.nspace, myproc.rank, rc);
DEBUG_DESTRUCT_LOCK(&mylock);
goto done; goto done;
} }
@ -203,7 +199,7 @@ int main(int argc, char **argv)
} }
/* wait for the first fence to finish */ /* wait for the first fence to finish */
WAIT_FOR_COMPLETION(active); DEBUG_WAIT_THREAD(&mylock);
/* wait for all my "get" calls to complete */ /* wait for all my "get" calls to complete */
while (getcount < num_gets) { while (getcount < num_gets) {

4
opal/mca/pmix/pmix4x/pmix/examples/dynamic.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
@ -35,7 +35,7 @@
#include <sys/param.h> #include <sys/param.h>
#include <pmix.h> #include <pmix.h>
#include "examples.h"
static pmix_proc_t myproc; static pmix_proc_t myproc;

124
opal/mca/pmix/pmix4x/pmix/examples/examples.h Обычный файл
Просмотреть файл

@ -0,0 +1,124 @@
/*
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2011 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2013 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*
*/
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <time.h>
#include <pthread.h>
#include <pmix_common.h>
typedef struct {
pthread_mutex_t mutex;
pthread_cond_t cond;
volatile bool active;
pmix_status_t status;
int count;
size_t evhandler_ref;
} mylock_t;
#define DEBUG_CONSTRUCT_LOCK(l) \
do { \
pthread_mutex_init(&(l)->mutex, NULL); \
pthread_cond_init(&(l)->cond, NULL); \
(l)->active = true; \
(l)->status = PMIX_SUCCESS; \
(l)->count = 0; \
(l)->evhandler_ref = 0; \
} while(0)
#define DEBUG_DESTRUCT_LOCK(l) \
do { \
pthread_mutex_destroy(&(l)->mutex); \
pthread_cond_destroy(&(l)->cond); \
} while(0)
#define DEBUG_WAIT_THREAD(lck) \
do { \
pthread_mutex_lock(&(lck)->mutex); \
while ((lck)->active) { \
pthread_cond_wait(&(lck)->cond, &(lck)->mutex); \
} \
pthread_mutex_unlock(&(lck)->mutex); \
} while(0)
#define DEBUG_WAKEUP_THREAD(lck) \
do { \
pthread_mutex_lock(&(lck)->mutex); \
(lck)->active = false; \
pthread_cond_broadcast(&(lck)->cond); \
pthread_mutex_unlock(&(lck)->mutex); \
} while(0)
/* define a structure for collecting returned
* info from a query */
typedef struct {
mylock_t lock;
pmix_info_t *info;
size_t ninfo;
} myquery_data_t;
#define DEBUG_CONSTRUCT_MYQUERY(q) \
do { \
DEBUG_CONSTRUCT_LOCK(&((q)->lock)); \
(q)->info = NULL; \
(q)->ninfo = 0; \
} while(0)
#define DEBUG_DESTRUCT_MYQUERY(q) \
do { \
DEBUG_DESTRUCT_LOCK(&((q)->lock)); \
if (NULL != (q)->info) { \
PMIX_INFO_FREE((q)->info, (q)->ninfo); \
} \
} while(0)
/* define a structure for releasing when a given
* nspace terminates */
typedef struct {
mylock_t lock;
char *nspace;
int exit_code;
bool exit_code_given;
} myrel_t;
#define DEBUG_CONSTRUCT_MYREL(r) \
do { \
DEBUG_CONSTRUCT_LOCK(&((r)->lock)); \
(r)->nspace = NULL; \
(r)->exit_code = 0; \
(r)->exit_code_given = false; \
} while(0)
#define DEBUG_DESTRUCT_MYREL(r) \
do { \
DEBUG_DESTRUCT_LOCK(&((r)->lock)); \
if (NULL != (r)->nspace) { \
free((r)->nspace); \
} \
} while(0)

97
opal/mca/pmix/pmix4x/pmix/examples/fault.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -28,11 +28,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include <pthread.h>
#include <pmix.h> #include <pmix.h>
#include "examples.h"
static pmix_proc_t myproc; static pmix_proc_t myproc;
static bool completed;
static void notification_fn(size_t evhdlr_registration_id, static void notification_fn(size_t evhdlr_registration_id,
pmix_status_t status, pmix_status_t status,
@ -42,22 +43,67 @@ static void notification_fn(size_t evhdlr_registration_id,
pmix_event_notification_cbfunc_fn_t cbfunc, pmix_event_notification_cbfunc_fn_t cbfunc,
void *cbdata) void *cbdata)
{ {
fprintf(stderr, "Client %s:%d NOTIFIED with status %d\n", myproc.nspace, myproc.rank, status); myrel_t *lock;
completed = true; bool found;
int exit_code;
size_t n;
pmix_proc_t *affected = NULL;
/* find our return object */
lock = NULL;
found = false;
for (n=0; n < ninfo; n++) {
if (0 == strncmp(info[n].key, PMIX_EVENT_RETURN_OBJECT, PMIX_MAX_KEYLEN)) {
lock = (myrel_t*)info[n].value.data.ptr;
/* not every RM will provide an exit code, but check if one was given */
} else if (0 == strncmp(info[n].key, PMIX_EXIT_CODE, PMIX_MAX_KEYLEN)) {
exit_code = info[n].value.data.integer;
found = true;
} else if (0 == strncmp(info[n].key, PMIX_EVENT_AFFECTED_PROC, PMIX_MAX_KEYLEN)) {
affected = info[n].value.data.proc;
}
}
/* if the object wasn't returned, then that is an error */
if (NULL == lock) {
fprintf(stderr, "LOCK WASN'T RETURNED IN RELEASE CALLBACK\n");
/* let the event handler progress */
if (NULL != cbfunc) {
cbfunc(PMIX_SUCCESS, NULL, 0, NULL, NULL, cbdata);
}
return;
}
/* tell the event handler state machine that we are the last step */
if (NULL != cbfunc) {
cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
}
fprintf(stderr, "DEBUGGER DAEMON NOTIFIED TERMINATED - AFFECTED %s\n",
(NULL == affected) ? "NULL" : affected->nspace);
if (found) {
lock->exit_code = exit_code;
lock->exit_code_given = true;
}
DEBUG_WAKEUP_THREAD(&lock->lock);
} }
static void op_callbk(pmix_status_t status, static void op_callbk(pmix_status_t status,
void *cbdata) void *cbdata)
{ {
mylock_t *lock = (mylock_t*)cbdata;
fprintf(stderr, "Client %s:%d OP CALLBACK CALLED WITH STATUS %d\n", myproc.nspace, myproc.rank, status); fprintf(stderr, "Client %s:%d OP CALLBACK CALLED WITH STATUS %d\n", myproc.nspace, myproc.rank, status);
DEBUG_WAKEUP_THREAD(lock);
} }
static void errhandler_reg_callbk(pmix_status_t status, static void evhandler_reg_callbk(pmix_status_t status,
size_t errhandler_ref, size_t errhandler_ref,
void *cbdata) void *cbdata)
{ {
mylock_t *lock = (mylock_t*)cbdata;
fprintf(stderr, "Client %s:%d ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu\n", fprintf(stderr, "Client %s:%d ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu\n",
myproc.nspace, myproc.rank, status, (unsigned long)errhandler_ref); myproc.nspace, myproc.rank, status, (unsigned long)errhandler_ref);
DEBUG_WAKEUP_THREAD(lock);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
@ -67,6 +113,10 @@ int main(int argc, char **argv)
pmix_value_t *val = &value; pmix_value_t *val = &value;
pmix_proc_t proc; pmix_proc_t proc;
uint32_t nprocs; uint32_t nprocs;
pmix_info_t *info;
mylock_t mylock;
myrel_t myrel;
pmix_status_t code[2] = {PMIX_ERR_PROC_ABORTED, PMIX_ERR_JOB_TERMINATED};
/* init us */ /* init us */
if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) { if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc, NULL, 0))) {
@ -87,11 +137,27 @@ int main(int argc, char **argv)
nprocs = val->data.uint32; nprocs = val->data.uint32;
PMIX_VALUE_RELEASE(val); PMIX_VALUE_RELEASE(val);
fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs); fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
completed = false;
/* register our errhandler */ /* register another handler specifically for when the target
PMIx_Register_event_handler(NULL, 0, NULL, 0, * job completes */
notification_fn, errhandler_reg_callbk, NULL); DEBUG_CONSTRUCT_MYREL(&myrel);
PMIX_INFO_CREATE(info, 2);
PMIX_INFO_LOAD(&info[0], PMIX_EVENT_RETURN_OBJECT, &myrel, PMIX_POINTER);
/* only call me back when one of us terminates */
PMIX_INFO_LOAD(&info[1], PMIX_NSPACE, myproc.nspace, PMIX_STRING);
DEBUG_CONSTRUCT_LOCK(&mylock);
PMIx_Register_event_handler(code, 2, info, 2,
notification_fn, evhandler_reg_callbk, (void*)&mylock);
DEBUG_WAIT_THREAD(&mylock);
if (PMIX_SUCCESS != mylock.status) {
rc = mylock.status;
DEBUG_DESTRUCT_LOCK(&mylock);
PMIX_INFO_FREE(info, 2);
goto done;
}
DEBUG_DESTRUCT_LOCK(&mylock);
PMIX_INFO_FREE(info, 2);
/* call fence to sync */ /* call fence to sync */
PMIX_PROC_CONSTRUCT(&proc); PMIX_PROC_CONSTRUCT(&proc);
@ -109,17 +175,16 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
/* everyone simply waits */ /* everyone simply waits */
while (!completed) { DEBUG_WAIT_THREAD(&myrel.lock);
struct timespec ts; DEBUG_DESTRUCT_MYREL(&myrel);
ts.tv_sec = 0;
ts.tv_nsec = 100000;
nanosleep(&ts, NULL);
}
done: done:
/* finalize us */ /* finalize us */
fprintf(stderr, "Client ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank); fprintf(stderr, "Client ns %s rank %d: Finalizing\n", myproc.nspace, myproc.rank);
PMIx_Deregister_event_handler(1, op_callbk, NULL); DEBUG_CONSTRUCT_LOCK(&mylock);
PMIx_Deregister_event_handler(1, op_callbk, &mylock);
DEBUG_WAIT_THREAD(&mylock);
DEBUG_DESTRUCT_LOCK(&mylock);
if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) { if (PMIX_SUCCESS != (rc = PMIx_Finalize(NULL, 0))) {
fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d:PMIx_Finalize failed: %d\n", myproc.nspace, myproc.rank, rc);

71
opal/mca/pmix/pmix4x/pmix/examples/jctrl.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -32,6 +32,7 @@
#include <signal.h> #include <signal.h>
#include <pmix.h> #include <pmix.h>
#include "examples.h"
static pmix_proc_t myproc; static pmix_proc_t myproc;
@ -63,13 +64,15 @@ static void evhandler_reg_callbk(pmix_status_t status,
size_t evhandler_ref, size_t evhandler_ref,
void *cbdata) void *cbdata)
{ {
volatile int *active = (volatile int*)cbdata; mylock_t *lock = (mylock_t*)cbdata;
if (PMIX_SUCCESS != status) { if (PMIX_SUCCESS != status) {
fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n", fprintf(stderr, "Client %s:%d EVENT HANDLER REGISTRATION FAILED WITH STATUS %d, ref=%lu\n",
myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref); myproc.nspace, myproc.rank, status, (unsigned long)evhandler_ref);
} }
*active = status; lock->status = status;
lock->evhandler_ref = evhandler_ref;
DEBUG_WAKEUP_THREAD(lock);
} }
static void infocbfunc(pmix_status_t status, static void infocbfunc(pmix_status_t status,
@ -78,26 +81,27 @@ static void infocbfunc(pmix_status_t status,
pmix_release_cbfunc_t release_fn, pmix_release_cbfunc_t release_fn,
void *release_cbdata) void *release_cbdata)
{ {
volatile int *active = (volatile int*)cbdata; mylock_t *lock = (mylock_t*)cbdata;
/* release the caller */ /* release the caller */
if (NULL != release_fn) { if (NULL != release_fn) {
release_fn(release_cbdata); release_fn(release_cbdata);
} }
*active = status; lock->status = status;
DEBUG_WAKEUP_THREAD(lock);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int rc; pmix_status_t rc;
pmix_value_t value; pmix_value_t value;
pmix_value_t *val = &value; pmix_value_t *val = &value;
pmix_proc_t proc; pmix_proc_t proc;
uint32_t nprocs, n; uint32_t nprocs, n;
pmix_info_t *info, *iptr; pmix_info_t *info, *iptr;
bool flag; bool flag;
volatile int active; mylock_t mylock;
pmix_data_array_t *dptr; pmix_data_array_t *dptr;
/* init us - note that the call to "init" includes the return of /* init us - note that the call to "init" includes the return of
@ -111,15 +115,16 @@ int main(int argc, char **argv)
/* register our default event handler - again, this isn't strictly /* register our default event handler - again, this isn't strictly
* required, but is generally good practice */ * required, but is generally good practice */
active = -1; DEBUG_CONSTRUCT_LOCK(&mylock);
PMIx_Register_event_handler(NULL, 0, NULL, 0, PMIx_Register_event_handler(NULL, 0, NULL, 0,
notification_fn, evhandler_reg_callbk, (void*)&active); notification_fn, evhandler_reg_callbk, (void*)&mylock);
while (-1 == active) { /* wait for registration to complete */
sleep(1); DEBUG_WAIT_THREAD(&mylock);
} rc = mylock.status;
if (0 != active) { DEBUG_DESTRUCT_LOCK(&mylock);
if (PMIX_SUCCESS != rc) {
fprintf(stderr, "[%s:%d] Default handler registration failed\n", myproc.nspace, myproc.rank); fprintf(stderr, "[%s:%d] Default handler registration failed\n", myproc.nspace, myproc.rank);
exit(active); goto done;
} }
/* job-related info is found in our nspace, assigned to the /* job-related info is found in our nspace, assigned to the
@ -145,12 +150,8 @@ int main(int argc, char **argv)
PMIX_INFO_LOAD(&info[0], PMIX_JOB_CTRL_PREEMPTIBLE, (void*)&flag, PMIX_BOOL); PMIX_INFO_LOAD(&info[0], PMIX_JOB_CTRL_PREEMPTIBLE, (void*)&flag, PMIX_BOOL);
/* can't use "load" to load a pmix_data_array_t */ /* can't use "load" to load a pmix_data_array_t */
(void)strncpy(info[1].key, PMIX_JOB_CTRL_CHECKPOINT_METHOD, PMIX_MAX_KEYLEN); (void)strncpy(info[1].key, PMIX_JOB_CTRL_CHECKPOINT_METHOD, PMIX_MAX_KEYLEN);
info[1].value.type = PMIX_DATA_ARRAY; PMIX_DATA_ARRAY_CREATE(info[1].value.data.darray, 2, PMIX_INFO);
dptr = (pmix_data_array_t*)malloc(sizeof(pmix_data_array_t)); dptr = info[1].value.data.darray;
info[1].value.data.darray = dptr;
dptr->type = PMIX_INFO;
dptr->size = 2;
PMIX_INFO_CREATE(dptr->array, dptr->size);
rc = SIGUSR2; rc = SIGUSR2;
iptr = (pmix_info_t*)dptr->array; iptr = (pmix_info_t*)dptr->array;
PMIX_INFO_LOAD(&iptr[0], PMIX_JOB_CTRL_CHECKPOINT_SIGNAL, &rc, PMIX_INT); PMIX_INFO_LOAD(&iptr[0], PMIX_JOB_CTRL_CHECKPOINT_SIGNAL, &rc, PMIX_INT);
@ -159,18 +160,19 @@ int main(int argc, char **argv)
/* since this is informational and not a requested operation, the target parameter /* since this is informational and not a requested operation, the target parameter
* doesn't mean anything and can be ignored */ * doesn't mean anything and can be ignored */
active = -1; DEBUG_CONSTRUCT_LOCK(&mylock);
if (PMIX_SUCCESS != (rc = PMIx_Job_control_nb(NULL, 0, info, 2, infocbfunc, (void*)&active))) { if (PMIX_SUCCESS != (rc = PMIx_Job_control_nb(NULL, 0, info, 2, infocbfunc, (void*)&mylock))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Job_control_nb failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Job_control_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
DEBUG_DESTRUCT_LOCK(&mylock);
goto done; goto done;
} }
while (-1 == active) { DEBUG_WAIT_THREAD(&mylock);
sleep(1);
}
PMIX_INFO_FREE(info, 2); PMIX_INFO_FREE(info, 2);
if (0 != active) { rc = mylock.status;
DEBUG_DESTRUCT_LOCK(&mylock);
if (PMIX_SUCCESS != rc) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Job_control_nb failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Job_control_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
exit(active); goto done;
} }
/* now request that this process be monitored using heartbeats */ /* now request that this process be monitored using heartbeats */
@ -185,20 +187,21 @@ int main(int argc, char **argv)
PMIX_INFO_LOAD(&info[2], PMIX_MONITOR_HEARTBEAT_DROPS, &n, PMIX_UINT32); PMIX_INFO_LOAD(&info[2], PMIX_MONITOR_HEARTBEAT_DROPS, &n, PMIX_UINT32);
/* make the request */ /* make the request */
active = -1; DEBUG_CONSTRUCT_LOCK(&mylock);
if (PMIX_SUCCESS != (rc = PMIx_Process_monitor_nb(iptr, PMIX_MONITOR_HEARTBEAT_ALERT, if (PMIX_SUCCESS != (rc = PMIx_Process_monitor_nb(iptr, PMIX_MONITOR_HEARTBEAT_ALERT,
info, 3, infocbfunc, (void*)&active))) { info, 3, infocbfunc, (void*)&mylock))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Process_monitor_nb failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Process_monitor_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
DEBUG_DESTRUCT_LOCK(&mylock);
goto done; goto done;
} }
while (-1 == active) { DEBUG_WAIT_THREAD(&mylock);
sleep(1);
}
PMIX_INFO_FREE(iptr, 1); PMIX_INFO_FREE(iptr, 1);
PMIX_INFO_FREE(info, 3); PMIX_INFO_FREE(info, 3);
if (0 != active) { rc = mylock.status;
DEBUG_DESTRUCT_LOCK(&mylock);
if (PMIX_SUCCESS != rc) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Process_monitor_nb failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Process_monitor_nb failed: %d\n", myproc.nspace, myproc.rank, rc);
exit(active); goto done;
} }
/* send a heartbeat */ /* send a heartbeat */

30
opal/mca/pmix/pmix4x/pmix/examples/tool.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -29,6 +29,7 @@
#include <time.h> #include <time.h>
#include <pmix_tool.h> #include <pmix_tool.h>
#include "examples.h"
static void cbfunc(pmix_status_t status, static void cbfunc(pmix_status_t status,
pmix_info_t *info, size_t ninfo, pmix_info_t *info, size_t ninfo,
@ -36,15 +37,16 @@ static void cbfunc(pmix_status_t status,
pmix_release_cbfunc_t release_fn, pmix_release_cbfunc_t release_fn,
void *release_cbdata) void *release_cbdata)
{ {
volatile bool *active = (volatile bool*)cbdata; myquery_data_t *mydata = (myquery_data_t*)cbdata;
/* do something with the returned info - it will be /* do something with the returned info - it will be
* released in the release_fn */ * released in the release_fn */
fprintf(stderr, "Query returned %s\n", PMIx_Error_string(status));
if (NULL != release_fn) { if (NULL != release_fn) {
release_fn(release_cbdata); release_fn(release_cbdata);
} }
*active = false; DEBUG_WAKEUP_THREAD(&mydata->lock);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
@ -53,13 +55,23 @@ int main(int argc, char **argv)
pmix_proc_t myproc; pmix_proc_t myproc;
pmix_query_t *query; pmix_query_t *query;
size_t nq; size_t nq;
volatile bool active; myquery_data_t mydata;
pmix_info_t info;
if (argc != 2) {
fprintf(stderr, "Must provide server URI as argument\n");
exit(1);
}
PMIX_INFO_LOAD(&info, PMIX_SERVER_URI, argv[1], PMIX_STRING);
fprintf(stderr, "Connecting to %s\n", argv[1]);
/* init us */ /* init us */
if (PMIX_SUCCESS != (rc = PMIx_tool_init(&myproc, NULL, 0))) { if (PMIX_SUCCESS != (rc = PMIx_tool_init(&myproc, &info, 1))) {
fprintf(stderr, "PMIx_tool_init failed: %d\n", rc); fprintf(stderr, "PMIx_tool_init failed: %d\n", rc);
exit(rc); exit(rc);
} }
fprintf(stderr, "Connected\n");
/* query something */ /* query something */
nq = 2; nq = 2;
@ -70,14 +82,12 @@ int main(int argc, char **argv)
query[1].keys = (char**)malloc(2 * sizeof(char*)); query[1].keys = (char**)malloc(2 * sizeof(char*));
query[1].keys[0] = strdup("spastic"); query[1].keys[0] = strdup("spastic");
query[1].keys[1] = NULL; query[1].keys[1] = NULL;
active = true; DEBUG_CONSTRUCT_MYQUERY(&mydata);
if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, nq, cbfunc, (void*)&active))) { if (PMIX_SUCCESS != (rc = PMIx_Query_info_nb(query, nq, cbfunc, (void*)&mydata))) {
fprintf(stderr, "Client ns %s rank %d: PMIx_Query_info failed: %d\n", myproc.nspace, myproc.rank, rc); fprintf(stderr, "Client ns %s rank %d: PMIx_Query_info failed: %d\n", myproc.nspace, myproc.rank, rc);
goto done; goto done;
} }
while(active) { DEBUG_WAIT_THREAD(&mydata.lock);
usleep(10);
}
done: done:
/* finalize us */ /* finalize us */

367
opal/mca/pmix/pmix4x/pmix/include/pmix_common.h.in
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2016-2018 Research Organization for Information Science * Copyright (c) 2016-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved.
@ -109,6 +109,9 @@ typedef uint32_t pmix_rank_t;
#define PMIX_RANK_LOCAL_PEERS UINT32_MAX-4 // all peers (i.e., all procs within the same nspace) on local node #define PMIX_RANK_LOCAL_PEERS UINT32_MAX-4 // all peers (i.e., all procs within the same nspace) on local node
/* define an invalid value */ /* define an invalid value */
#define PMIX_RANK_INVALID UINT32_MAX-3 #define PMIX_RANK_INVALID UINT32_MAX-3
/* define a boundary for valid ranks */
#define PMIX_RANK_VALID UINT32_MAX-50
/**** PMIX ENVIRONMENTAL PARAMETERS ****/ /**** PMIX ENVIRONMENTAL PARAMETERS ****/
/* There are a few environmental parameters used by PMIx for /* There are a few environmental parameters used by PMIx for
@ -416,11 +419,15 @@ typedef uint32_t pmix_rank_t;
#define PMIX_FWD_STDDIAG "pmix.fwd.stddiag" // (bool) if a diagnostic channel exists, forward any output on it #define PMIX_FWD_STDDIAG "pmix.fwd.stddiag" // (bool) if a diagnostic channel exists, forward any output on it
// from the spawned processes to this process (typically used by a tool) // from the spawned processes to this process (typically used by a tool)
#define PMIX_SPAWN_TOOL "pmix.spwn.tool" // (bool) job being spawned is a tool #define PMIX_SPAWN_TOOL "pmix.spwn.tool" // (bool) job being spawned is a tool
#define PMIX_CMD_LINE "pmix.cmd.line" // (char*) command line executing in the specified nspace
/* query attributes */ /* query attributes */
#define PMIX_QUERY_REFRESH_CACHE "pmix.qry.rfsh" // (bool) retrieve updated information from server #define PMIX_QUERY_REFRESH_CACHE "pmix.qry.rfsh" // (bool) retrieve updated information from server
// to update local cache // to update local cache
#define PMIX_QUERY_NAMESPACES "pmix.qry.ns" // (char*) request a comma-delimited list of active nspaces #define PMIX_QUERY_NAMESPACES "pmix.qry.ns" // (char*) return a comma-delimited list of active namespaces
#define PMIX_QUERY_NAMESPACE_INFO "pmix.qry.nsinfo" // (pmix_data_array_t) request an array of active nspace information - each
// element will contain an array including the namespace plus the
// command line of the application executing within it
#define PMIX_QUERY_JOB_STATUS "pmix.qry.jst" // (pmix_status_t) status of a specified currently executing job #define PMIX_QUERY_JOB_STATUS "pmix.qry.jst" // (pmix_status_t) status of a specified currently executing job
#define PMIX_QUERY_QUEUE_LIST "pmix.qry.qlst" // (char*) request a comma-delimited list of scheduler queues #define PMIX_QUERY_QUEUE_LIST "pmix.qry.qlst" // (char*) request a comma-delimited list of scheduler queues
#define PMIX_QUERY_QUEUE_STATUS "pmix.qry.qst" // (TBD) status of a specified scheduler queue #define PMIX_QUERY_QUEUE_STATUS "pmix.qry.qst" // (TBD) status of a specified scheduler queue
@ -445,6 +452,49 @@ typedef uint32_t pmix_rank_t;
#define PMIX_QUERY_PSET_NAMES "pmix.qry.psets" // (char*) return a comma-delimited list of the names of the #define PMIX_QUERY_PSET_NAMES "pmix.qry.psets" // (char*) return a comma-delimited list of the names of the
// psets defined in the specified range (defaults to session) // psets defined in the specified range (defaults to session)
/* information retrieval attributes */
#define PMIX_SESSION_INFO "pmix.ssn.info" // (bool) Return information about the specified session. If information
// about a session other than the one containing the requesting
// process is desired, then the attribute array must contain a
// PMIX_SESSION_ID attribute identifying the desired target.
#define PMIX_JOB_INFO "pmix.job.info" // (bool) Return information about the specified job or namespace. If
// information about a job or namespace other than the one containing
// the requesting process is desired, then the attribute array must
// contain a PMIX_JOBID or PMIX_NSPACE attribute identifying the
// desired target. Similarly, if information is requested about a
// job or namespace in a session other than the one containing the
// requesting process, then an attribute identifying the target
// session must be provided.
#define PMIX_APP_INFO "pmix.app.info" // (bool) Return information about the specified application. If information
// about an application other than the one containing the requesting
// process is desired, then the attribute array must contain a
// PMIX_APPNUM attribute identifying the desired target. Similarly,
// if information is requested about an application in a job or session
// other than the one containing the requesting process, then attributes
// identifying the target job and/or session must be provided.
#define PMIX_NODE_INFO "pmix.node.info" // (bool) Return information about the specified node. If information about a
// node other than the one containing the requesting process is desired,
// then the attribute array must contain either the PMIX_NODEID or
// PMIX_HOSTNAME attribute identifying the desired target.
/* information storage attributes */
#define PMIX_SESSION_INFO_ARRAY "pmix.ssn.arr" // (pmix_data_array_t) Provide an array of pmix_info_t containing
// session-level information. The PMIX_SESSION_ID attribute is required
// to be included in the array.
#define PMIX_JOB_INFO_ARRAY "pmix.job.arr" // (pmix_data_array_t) Provide an array of pmix_info_t containing job-level
// information. Information is registered one job (aka namespace) at a time
// via the PMIx_server_register_nspace API. Thus, there is no requirement that
// the array contain either the PMIX_NSPACE or PMIX_JOBID attributes, though
// either or both of them may be included.
#define PMIX_APP_INFO_ARRAY "pmix.app.arr" // (pmix_data_array_t) Provide an array of pmix_info_t containing app-level
// information. The PMIX_NSPACE or PMIX_JOBID attributes of the job containing
// the appplication, plus its PMIX_APPNUM attribute, are required to be
// included in the array.
#define PMIX_NODE_INFO_ARRAY "pmix.node.arr" // (pmix_data_array_t) Provide an array of pmix_info_t containing node-level
// information. At a minimum, either the PMIX_NODEID or PMIX_HOSTNAME
// attribute is required to be included in the array, though both may be
// included.
/* log attributes */ /* log attributes */
#define PMIX_LOG_SOURCE "pmix.log.source" // (pmix_proc_t*) ID of source of the log request #define PMIX_LOG_SOURCE "pmix.log.source" // (pmix_proc_t*) ID of source of the log request
#define PMIX_LOG_STDERR "pmix.log.stderr" // (char*) log string to stderr #define PMIX_LOG_STDERR "pmix.log.stderr" // (char*) log string to stderr
@ -915,7 +965,7 @@ typedef uint8_t pmix_scope_t;
#define PMIX_GLOBAL 3 // share with all procs (local + remote) #define PMIX_GLOBAL 3 // share with all procs (local + remote)
#define PMIX_INTERNAL 4 // store data in the internal tables #define PMIX_INTERNAL 4 // store data in the internal tables
/* define a range for data "published" by PMI /* define a range for data "published" by PMIx
*/ */
typedef uint8_t pmix_data_range_t; typedef uint8_t pmix_data_range_t;
#define PMIX_RANGE_UNDEF 0 #define PMIX_RANGE_UNDEF 0
@ -941,6 +991,7 @@ typedef uint8_t pmix_persistence_t;
* command directives via pmix_info_t arrays */ * command directives via pmix_info_t arrays */
typedef uint32_t pmix_info_directives_t; typedef uint32_t pmix_info_directives_t;
#define PMIX_INFO_REQD 0x00000001 #define PMIX_INFO_REQD 0x00000001
#define PMIX_INFO_ARRAY_END 0x00000002 // mark the end of an array created by PMIX_INFO_CREATE
/* the top 16-bits are reserved for internal use by /* the top 16-bits are reserved for internal use by
* implementers - these may be changed inside the * implementers - these may be changed inside the
* PMIx library */ * PMIx library */
@ -1047,16 +1098,18 @@ typedef struct pmix_byte_object {
} \ } \
} while(0) } while(0)
#define PMIX_BYTE_OBJECT_FREE(m, n) \ #define PMIX_BYTE_OBJECT_FREE(m, n) \
do { \ do { \
size_t _n; \ size_t _bon; \
for (_n=0; _n < n; _n++) { \ if (NULL != (m)) { \
if (NULL != (m)[_n].bytes) { \ for (_bon=0; _bon < n; _bon++) { \
free((m)[_n].bytes); \ if (NULL != (m)[_bon].bytes) { \
} \ free((m)[_bon].bytes); \
} \ } \
free((m)); \ } \
(m) = NULL; \ free((m)); \
(m) = NULL; \
} \
} while(0) } while(0)
#define PMIX_BYTE_OBJECT_LOAD(b, d, s) \ #define PMIX_BYTE_OBJECT_LOAD(b, d, s) \
@ -1089,10 +1142,10 @@ typedef struct {
} while (0) } while (0)
#define PMIX_ENVAR_FREE(m, n) \ #define PMIX_ENVAR_FREE(m, n) \
do { \ do { \
size_t _k; \ size_t _ek; \
if (NULL != (m)) { \ if (NULL != (m)) { \
for (_k=0; _k < (n); _k++) { \ for (_ek=0; _ek < (n); _ek++) { \
PMIX_ENVAR_DESTRUCT(&(m)[_k]); \ PMIX_ENVAR_DESTRUCT(&(m)[_ek]); \
} \ } \
free((m)); \ free((m)); \
} \ } \
@ -1296,25 +1349,20 @@ typedef struct pmix_proc_info {
} while (0) } while (0)
/**** PMIX VALUE STRUCT ****/ /**** PMIX DATA ARRAY STRUCT ****/
typedef struct pmix_data_array { typedef struct pmix_data_array {
pmix_data_type_t type; pmix_data_type_t type;
size_t size; size_t size;
void *array; void *array;
} pmix_data_array_t; } pmix_data_array_t;
#define PMIX_DATA_ARRAY_CONSTRUCT(m, n, t) \
do { \
(m)->type = (t); \
(m)->size = (n); \
} while(0)
#define PMIX_DATA_ARRAY_CREATE(m, n, t) \
do { \
(m) = (pmix_data_array_t*)calloc(1, sizeof(pmix_data_array_t)); \
PMIX_DATA_ARRAY_CONSTRUCT((m), (n), (t)); \
} while(0)
/********************/ /**** THE PMIX_DATA_ARRAY SUPPORT MACROS ARE DEFINED ****/
/**** DOWN BELOW (NEAR THE BOTTOM OF THE FILE) TO ****/
/**** AVOID CIRCULAR DEPENDENCIES ****/
/**** PMIX VALUE STRUCT ****/
/* NOTE: operations can supply a collection of values under /* NOTE: operations can supply a collection of values under
* a single key by passing a pmix_value_t containing a * a single key by passing a pmix_value_t containing a
@ -1392,10 +1440,10 @@ typedef struct pmix_value {
#define PMIX_VALUE_FREE(m, n) \ #define PMIX_VALUE_FREE(m, n) \
do { \ do { \
size_t _s; \ size_t _vv; \
if (NULL != (m)) { \ if (NULL != (m)) { \
for (_s=0; _s < (n); _s++) { \ for (_vv=0; _vv < (n); _vv++) { \
PMIX_VALUE_DESTRUCT(&((m)[_s])); \ PMIX_VALUE_DESTRUCT(&((m)[_vv])); \
} \ } \
free((m)); \ free((m)); \
(m) = NULL; \ (m) = NULL; \
@ -1488,7 +1536,10 @@ typedef struct pmix_info {
/* utility macros for working with pmix_info_t structs */ /* utility macros for working with pmix_info_t structs */
#define PMIX_INFO_CREATE(m, n) \ #define PMIX_INFO_CREATE(m, n) \
do { \ do { \
pmix_info_t *_i; \
(m) = (pmix_info_t*)calloc((n), sizeof(pmix_info_t)); \ (m) = (pmix_info_t*)calloc((n), sizeof(pmix_info_t)); \
_i = (pmix_info_t*)(m); \
_i[(n)-1].flags = PMIX_INFO_ARRAY_END; \
} while (0) } while (0)
#define PMIX_INFO_CONSTRUCT(m) \ #define PMIX_INFO_CONSTRUCT(m) \
@ -1502,16 +1553,16 @@ typedef struct pmix_info {
PMIX_VALUE_DESTRUCT(&(m)->value); \ PMIX_VALUE_DESTRUCT(&(m)->value); \
} while (0) } while (0)
#define PMIX_INFO_FREE(m, n) \ #define PMIX_INFO_FREE(m, n) \
do { \ do { \
size_t _s; \ size_t _is; \
if (NULL != (m)) { \ if (NULL != (m)) { \
for (_s=0; _s < (n); _s++) { \ for (_is=0; _is < (n); _is++) { \
PMIX_INFO_DESTRUCT(&((m)[_s])); \ PMIX_INFO_DESTRUCT(&((m)[_is])); \
} \ } \
free((m)); \ free((m)); \
(m) = NULL; \ (m) = NULL; \
} \ } \
} while (0) } while (0)
#define PMIX_INFO_LOAD(m, k, v, t) \ #define PMIX_INFO_LOAD(m, k, v, t) \
@ -1532,11 +1583,14 @@ typedef struct pmix_info {
} while(0) } while(0)
/* macros for setting and unsetting the "reqd" flag
* in a pmix_info_t */
#define PMIX_INFO_REQUIRED(m) \ #define PMIX_INFO_REQUIRED(m) \
(m)->flags |= PMIX_INFO_REQD (m)->flags |= PMIX_INFO_REQD
#define PMIX_INFO_OPTIONAL(m) \ #define PMIX_INFO_OPTIONAL(m) \
(m)->flags &= ~PMIX_INFO_REQD (m)->flags &= ~PMIX_INFO_REQD
/* macros for testing the "reqd" flag in a pmix_info_t */
#define PMIX_INFO_IS_REQUIRED(m) \ #define PMIX_INFO_IS_REQUIRED(m) \
(m)->flags & PMIX_INFO_REQD (m)->flags & PMIX_INFO_REQD
#define PMIX_INFO_IS_OPTIONAL(m) \ #define PMIX_INFO_IS_OPTIONAL(m) \
@ -1584,10 +1638,11 @@ typedef struct pmix_pdata {
#define PMIX_PDATA_FREE(m, n) \ #define PMIX_PDATA_FREE(m, n) \
do { \ do { \
size_t _s; \ size_t _ps; \
if (NULL != (m)) { \ pmix_pdata_t *_pdf = (pmix_pdata_t*)(m); \
for (_s=0; _s < (n); _s++) { \ if (NULL != _pdf) { \
PMIX_PDATA_DESTRUCT(&((m)[_s])); \ for (_ps=0; _ps < (n); _ps++) { \
PMIX_PDATA_DESTRUCT(&(_pdf[_ps])); \
} \ } \
free((m)); \ free((m)); \
(m) = NULL; \ (m) = NULL; \
@ -1633,6 +1688,12 @@ typedef struct pmix_app {
(m) = (pmix_app_t*)calloc((n), sizeof(pmix_app_t)); \ (m) = (pmix_app_t*)calloc((n), sizeof(pmix_app_t)); \
} while (0) } while (0)
#define PMIX_APP_INFO_CREATE(m, n) \
do { \
(m)->ninfo = (n); \
PMIX_INFO_CREATE((m)->info, (m)->ninfo); \
} while(0)
#define PMIX_APP_RELEASE(m) \ #define PMIX_APP_RELEASE(m) \
do { \ do { \
PMIX_APP_DESTRUCT((m)); \ PMIX_APP_DESTRUCT((m)); \
@ -1647,21 +1708,21 @@ typedef struct pmix_app {
#define PMIX_APP_DESTRUCT(m) \ #define PMIX_APP_DESTRUCT(m) \
do { \ do { \
size_t _ii; \ size_t _aii; \
if (NULL != (m)->cmd) { \ if (NULL != (m)->cmd) { \
free((m)->cmd); \ free((m)->cmd); \
(m)->cmd = NULL; \ (m)->cmd = NULL; \
} \ } \
if (NULL != (m)->argv) { \ if (NULL != (m)->argv) { \
for (_ii=0; NULL != (m)->argv[_ii]; _ii++) { \ for (_aii=0; NULL != (m)->argv[_aii]; _aii++) { \
free((m)->argv[_ii]); \ free((m)->argv[_aii]); \
} \ } \
free((m)->argv); \ free((m)->argv); \
(m)->argv = NULL; \ (m)->argv = NULL; \
} \ } \
if (NULL != (m)->env) { \ if (NULL != (m)->env) { \
for (_ii=0; NULL != (m)->env[_ii]; _ii++) { \ for (_aii=0; NULL != (m)->env[_aii]; _aii++) { \
free((m)->env[_ii]); \ free((m)->env[_aii]); \
} \ } \
free((m)->env); \ free((m)->env); \
(m)->env = NULL; \ (m)->env = NULL; \
@ -1671,20 +1732,18 @@ typedef struct pmix_app {
(m)->cwd = NULL; \ (m)->cwd = NULL; \
} \ } \
if (NULL != (m)->info) { \ if (NULL != (m)->info) { \
for (_ii=0; _ii < (m)->ninfo; _ii++) { \ PMIX_INFO_FREE((m)->info, (m)->ninfo); \
PMIX_INFO_DESTRUCT(&(m)->info[_ii]); \
} \
free((m)->info); \
(m)->info = NULL; \ (m)->info = NULL; \
(m)->ninfo = 0; \
} \ } \
} while (0) } while (0)
#define PMIX_APP_FREE(m, n) \ #define PMIX_APP_FREE(m, n) \
do { \ do { \
size_t _s; \ size_t _as; \
if (NULL != (m)) { \ if (NULL != (m)) { \
for (_s=0; _s < (n); _s++) { \ for (_as=0; _as < (n); _as++) { \
PMIX_APP_DESTRUCT(&((m)[_s])); \ PMIX_APP_DESTRUCT(&((m)[_as])); \
} \ } \
free((m)); \ free((m)); \
(m) = NULL; \ (m) = NULL; \
@ -1704,6 +1763,12 @@ typedef struct pmix_query {
(m) = (pmix_query_t*)calloc((n) , sizeof(pmix_query_t)); \ (m) = (pmix_query_t*)calloc((n) , sizeof(pmix_query_t)); \
} while (0) } while (0)
#define PMIX_QUERY_QUALIFIERS_CREATE(m, n) \
do { \
(m)->nqual = (n); \
PMIX_INFO_CREATE((m)->qualifiers, (m)->nqual); \
} while(0)
#define PMIX_QUERY_RELEASE(m) \ #define PMIX_QUERY_RELEASE(m) \
do { \ do { \
PMIX_QUERY_DESTRUCT((m)); \ PMIX_QUERY_DESTRUCT((m)); \
@ -1718,29 +1783,27 @@ typedef struct pmix_query {
#define PMIX_QUERY_DESTRUCT(m) \ #define PMIX_QUERY_DESTRUCT(m) \
do { \ do { \
size_t _ii; \ size_t _qi; \
if (NULL != (m)->keys) { \ if (NULL != (m)->keys) { \
for (_ii=0; NULL != (m)->keys[_ii]; _ii++) { \ for (_qi=0; NULL != (m)->keys[_qi]; _qi++) { \
free((m)->keys[_ii]); \ free((m)->keys[_qi]); \
} \ } \
free((m)->keys); \ free((m)->keys); \
(m)->keys = NULL; \ (m)->keys = NULL; \
} \ } \
if (NULL != (m)->qualifiers) { \ if (NULL != (m)->qualifiers) { \
for (_ii=0; _ii < (m)->nqual; _ii++) { \ PMIX_INFO_FREE((m)->qualifiers, (m)->nqual); \
PMIX_INFO_DESTRUCT(&(m)->qualifiers[_ii]); \
} \
free((m)->qualifiers); \
(m)->qualifiers = NULL; \ (m)->qualifiers = NULL; \
(m)->nqual = 0; \
} \ } \
} while (0) } while (0)
#define PMIX_QUERY_FREE(m, n) \ #define PMIX_QUERY_FREE(m, n) \
do { \ do { \
size_t _s; \ size_t _qs; \
if (NULL != (m)) { \ if (NULL != (m)) { \
for (_s=0; _s < (n); _s++) { \ for (_qs=0; _qs < (n); _qs++) { \
PMIX_QUERY_DESTRUCT(&((m)[_s])); \ PMIX_QUERY_DESTRUCT(&((m)[_qs])); \
} \ } \
free((m)); \ free((m)); \
(m) = NULL; \ (m) = NULL; \
@ -2472,8 +2535,10 @@ PMIX_EXPORT pmix_status_t PMIx_Data_copy_payload(pmix_data_buffer_t *dest,
pmix_data_buffer_t *src); pmix_data_buffer_t *src);
static inline void pmix_value_destruct(pmix_value_t * m) { static inline void pmix_darray_destruct(pmix_data_array_t *m);
size_t _n;
static inline void pmix_value_destruct(pmix_value_t * m)
{
if (PMIX_STRING == (m)->type) { if (PMIX_STRING == (m)->type) {
if (NULL != (m)->data.string) { if (NULL != (m)->data.string) {
free((m)->data.string); free((m)->data.string);
@ -2487,40 +2552,8 @@ static inline void pmix_value_destruct(pmix_value_t * m) {
(m)->data.bo.size = 0; (m)->data.bo.size = 0;
} }
} else if (PMIX_DATA_ARRAY == (m)->type) { } else if (PMIX_DATA_ARRAY == (m)->type) {
if (NULL != (m)->data.darray && NULL != (m)->data.darray->array) {
if (PMIX_STRING == (m)->data.darray->type) {
char **_str = (char**)(m)->data.darray->array;
for (_n=0; _n < (m)->data.darray->size; _n++) {
if (NULL != _str[_n]) {
free(_str[_n]);
}
}
} else if (PMIX_PROC_INFO == (m)->data.darray->type) {
pmix_proc_info_t *_info =
(pmix_proc_info_t*)(m)->data.darray->array;
for (_n=0; _n < (m)->data.darray->size; _n++) {
PMIX_PROC_INFO_DESTRUCT(&_info[_n]);
}
} else if (PMIX_INFO == (m)->data.darray->type) {
pmix_info_t *_info =
(pmix_info_t*)(m)->data.darray->array;
for (_n=0; _n < (m)->data.darray->size; _n++) {
pmix_value_destruct(&_info[_n].value);
}
} else if (PMIX_BYTE_OBJECT == (m)->data.darray->type) {
pmix_byte_object_t *_obj =
(pmix_byte_object_t*)(m)->data.darray->array;
for (_n=0; _n < (m)->data.darray->size; _n++) {
if (NULL != _obj[_n].bytes) {
free(_obj[_n].bytes);
}
}
}
free((m)->data.darray->array);
(m)->data.darray->array = NULL;
(m)->data.darray->size = 0;
}
if (NULL != (m)->data.darray) { if (NULL != (m)->data.darray) {
pmix_darray_destruct((m)->data.darray);
free((m)->data.darray); free((m)->data.darray);
(m)->data.darray = NULL; (m)->data.darray = NULL;
} }
@ -2531,6 +2564,136 @@ static inline void pmix_value_destruct(pmix_value_t * m) {
} }
} }
static inline void pmix_darray_destruct(pmix_data_array_t *m)
{
if (NULL != m) {
if (PMIX_INFO == m->type) {
pmix_info_t *_info = (pmix_info_t*)m->array;
PMIX_INFO_FREE(_info, m->size);
} else if (PMIX_PROC == m->type) {
pmix_proc_t *_p = (pmix_proc_t*)m->array;
PMIX_PROC_FREE(_p, m->size);
} else if (PMIX_PROC_INFO == m->type) {
pmix_proc_info_t *_pi = (pmix_proc_info_t*)m->array;
PMIX_PROC_INFO_FREE(_pi, m->size);
} else if (PMIX_ENVAR == m->type) {
pmix_envar_t *_e = (pmix_envar_t*)m->array;
PMIX_ENVAR_FREE(_e, m->size);
} else if (PMIX_VALUE == m->type) {
pmix_value_t *_v = (pmix_value_t*)m->array;
PMIX_VALUE_FREE(_v, m->size);
} else if (PMIX_PDATA == m->type) {
pmix_pdata_t *_pd = (pmix_pdata_t*)m->array;
PMIX_PDATA_FREE(_pd, m->size);
} else if (PMIX_QUERY == m->type) {
pmix_query_t *_q = (pmix_query_t*)m->array;
PMIX_QUERY_FREE(_q, m->size);
} else if (PMIX_APP == m->type) {
pmix_app_t *_a = (pmix_app_t*)m->array;
PMIX_APP_FREE(_a, m->size);
} else if (PMIX_BYTE_OBJECT == m->type) {
pmix_byte_object_t *_b = (pmix_byte_object_t*)m->array;
PMIX_BYTE_OBJECT_FREE(_b, m->size);
} else if (PMIX_STRING == m->type) {
char **_s = (char**)m->array;
size_t _si;
for (_si=0; _si < m->size; _si++) {
free(_s[_si]);
}
free(m->array);
m->array = NULL;
} else {
free(m->array);
}
}
}
#define PMIX_DATA_ARRAY_CONSTRUCT(m, n, t) \
do { \
(m)->type = (t); \
(m)->size = (n); \
if (0 < (n)) { \
if (PMIX_INFO == (t)) { \
PMIX_INFO_CREATE((m)->array, (n)); \
} else if (PMIX_PROC == (t)) { \
PMIX_PROC_CREATE((m)->array, (n)); \
} else if (PMIX_PROC_INFO == (t)) { \
PMIX_PROC_INFO_CREATE((m)->array, (n)); \
} else if (PMIX_ENVAR == (t)) { \
PMIX_ENVAR_CREATE((m)->array, (n)); \
} else if (PMIX_VALUE == (t)) { \
PMIX_VALUE_CREATE((m)->array, (n)); \
} else if (PMIX_PDATA == (t)) { \
PMIX_PDATA_CREATE((m)->array, (n)); \
} else if (PMIX_QUERY == (t)) { \
PMIX_QUERY_CREATE((m)->array, (n)); \
} else if (PMIX_APP == (t)) { \
PMIX_APP_CREATE((m)->array, (n)); \
} else if (PMIX_BYTE_OBJECT == (t)) { \
PMIX_BYTE_OBJECT_CREATE((m)->array, (n)); \
} else if (PMIX_ALLOC_DIRECTIVE == (t) || \
PMIX_PROC_STATE == (t) || \
PMIX_PERSIST == (t) || \
PMIX_SCOPE == (t) || \
PMIX_DATA_RANGE == (t) || \
PMIX_BYTE == (t) || \
PMIX_INT8 == (t) || \
PMIX_UINT8 == (t)) { \
(m)->array = calloc((n), sizeof(int8_t)); \
} else if (PMIX_STRING == (t)) { \
(m)->array = calloc((n), sizeof(char*)); \
} else if (PMIX_SIZE == (t)) { \
(m)->array = calloc((n), sizeof(size_t)); \
} else if (PMIX_PID == (t)) { \
(m)->array = calloc((n), sizeof(pid_t)); \
} else if (PMIX_INT == (t) || \
PMIX_UINT == (t) || \
PMIX_STATUS == (t)) { \
(m)->array = calloc((n), sizeof(int)); \
} else if (PMIX_IOF_CHANNEL == (t) || \
PMIX_DATA_TYPE == (t) || \
PMIX_INT16 == (t) || \
PMIX_UINT16 == (t)) { \
(m)->array = calloc((n), sizeof(int16_t)); \
} else if (PMIX_PROC_RANK == (t) || \
PMIX_INFO_DIRECTIVES == (t) || \
PMIX_INT32 == (t) || \
PMIX_UINT32 == (t)) { \
(m)->array = calloc((n), sizeof(int32_t)); \
} else if (PMIX_INT64 == (t) || \
PMIX_UINT64 == (t)) { \
(m)->array = calloc((n), sizeof(int64_t)); \
} else if (PMIX_FLOAT == (t)) { \
(m)->array = calloc((n), sizeof(float)); \
} else if (PMIX_DOUBLE == (t)) { \
(m)->array = calloc((n), sizeof(double)); \
} else if (PMIX_TIMEVAL == (t)) { \
(m)->array = calloc((n), sizeof(struct timeval)); \
} else if (PMIX_TIME == (t)) { \
(m)->array = calloc((n), sizeof(time_t)); \
} \
} else { \
(m)->array = NULL; \
} \
} while(0)
#define PMIX_DATA_ARRAY_CREATE(m, n, t) \
do { \
(m) = (pmix_data_array_t*)calloc(1, sizeof(pmix_data_array_t)); \
PMIX_DATA_ARRAY_CONSTRUCT((m), (n), (t)); \
} while(0)
#define PMIX_DATA_ARRAY_DESTRUCT(m) pmix_darray_destruct(m)
#define PMIX_DATA_ARRAY_FREE(m) \
do { \
if (NULL != (m)) { \
PMIX_DATA_ARRAY_DESTRUCT(m); \
free((m)); \
(m) = NULL; \
} \
} while(0)
/** /**
* Provide a safe version of strncpy that doesn't generate * Provide a safe version of strncpy that doesn't generate
* a ton of spurious warnings. Note that not every environment * a ton of spurious warnings. Note that not every environment

16
opal/mca/pmix/pmix4x/pmix/src/class/pmix_hotel.h
Просмотреть файл

@ -2,7 +2,7 @@
/* /*
* Copyright (c) 2012-2016 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2016 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved * Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved
* Copyright (c) 2015-2018 Intel, Inc. All rights reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -190,6 +190,7 @@ static inline pmix_status_t pmix_hotel_checkin(pmix_hotel_t *hotel,
/* Do we have any rooms available? */ /* Do we have any rooms available? */
if (PMIX_UNLIKELY(hotel->last_unoccupied_room < 0)) { if (PMIX_UNLIKELY(hotel->last_unoccupied_room < 0)) {
*room_num = -1;
return PMIX_ERR_OUT_OF_RESOURCE; return PMIX_ERR_OUT_OF_RESOURCE;
} }
@ -247,6 +248,10 @@ static inline void pmix_hotel_checkout(pmix_hotel_t *hotel, int room_num)
/* Bozo check */ /* Bozo check */
assert(room_num < hotel->num_rooms); assert(room_num < hotel->num_rooms);
if (0 > room_num) {
/* occupant wasn't checked in */
return;
}
/* If there's an occupant in the room, check them out */ /* If there's an occupant in the room, check them out */
room = &(hotel->rooms[room_num]); room = &(hotel->rooms[room_num]);
@ -285,6 +290,11 @@ static inline void pmix_hotel_checkout_and_return_occupant(pmix_hotel_t *hotel,
/* Bozo check */ /* Bozo check */
assert(room_num < hotel->num_rooms); assert(room_num < hotel->num_rooms);
if (0 > room_num) {
/* occupant wasn't checked in */
*occupant = NULL;
return;
}
/* If there's an occupant in the room, check them out */ /* If there's an occupant in the room, check them out */
room = &(hotel->rooms[room_num]); room = &(hotel->rooms[room_num]);
@ -339,6 +349,10 @@ static inline void pmix_hotel_knock(pmix_hotel_t *hotel, int room_num, void **oc
assert(room_num < hotel->num_rooms); assert(room_num < hotel->num_rooms);
*occupant = NULL; *occupant = NULL;
if (0 > room_num) {
/* occupant wasn't checked in */
return;
}
/* If there's an occupant in the room, have them come to the door */ /* If there's an occupant in the room, have them come to the door */
room = &(hotel->rooms[room_num]); room = &(hotel->rooms[room_num]);

13
opal/mca/pmix/pmix4x/pmix/src/client/pmix_client_group.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2017 Research Organization for Information Science * Copyright (c) 2014-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2014 Artem Y. Polyakov <artpol84@gmail.com>.
@ -627,12 +627,13 @@ PMIX_EXPORT pmix_status_t PMIx_Group_invite(const char grp[],
(void)strncpy(cb.info[n].key, PMIX_EVENT_CUSTOM_RANGE, PMIX_MAX_KEYLEN); (void)strncpy(cb.info[n].key, PMIX_EVENT_CUSTOM_RANGE, PMIX_MAX_KEYLEN);
cb.info[n].value.type = PMIX_DATA_ARRAY; cb.info[n].value.type = PMIX_DATA_ARRAY;
PMIX_DATA_ARRAY_CREATE(cb.info[n].value.data.darray, nprocs, PMIX_PROC); PMIX_DATA_ARRAY_CREATE(cb.info[n].value.data.darray, nprocs, PMIX_PROC);
if (NULL == cb.info[n].value.data.darray) { if (NULL == cb.info[n].value.data.darray ||
NULL == cb.info[n].value.data.darray->array) {
PMIX_DESTRUCT(&cb); PMIX_DESTRUCT(&cb);
return PMIX_ERR_NOMEM; return PMIX_ERR_NOMEM;
} }
PMIX_PROC_CREATE(cb.info[n].value.data.darray->array, nprocs); memcpy(cb.info[n].value.data.darray->array, procs, nprocs * sizeof(pmix_proc_t));
memcpy(cb.info[n++].value.data.darray->array, procs, nprocs * sizeof(pmix_proc_t)); ++n;
/* mark that this only goes to non-default handlers */ /* mark that this only goes to non-default handlers */
PMIX_INFO_LOAD(&cb.info[n], PMIX_EVENT_NON_DEFAULT, NULL, PMIX_BOOL); PMIX_INFO_LOAD(&cb.info[n], PMIX_EVENT_NON_DEFAULT, NULL, PMIX_BOOL);
++n; ++n;
@ -753,7 +754,8 @@ PMIX_EXPORT pmix_status_t PMIx_Group_invite_nb(const char grp[],
(void)strncpy(cb->info[n].key, PMIX_EVENT_CUSTOM_RANGE, PMIX_MAX_KEYLEN); (void)strncpy(cb->info[n].key, PMIX_EVENT_CUSTOM_RANGE, PMIX_MAX_KEYLEN);
cb->info[n].value.type = PMIX_DATA_ARRAY; cb->info[n].value.type = PMIX_DATA_ARRAY;
PMIX_DATA_ARRAY_CREATE(cb->info[n].value.data.darray, nprocs, PMIX_PROC); PMIX_DATA_ARRAY_CREATE(cb->info[n].value.data.darray, nprocs, PMIX_PROC);
if (NULL == cb->info[n].value.data.darray) { if (NULL == cb->info[n].value.data.darray ||
NULL == cb->info[n].value.data.darray->array) {
PMIX_CONSTRUCT(&lock, pmix_cb_t); PMIX_CONSTRUCT(&lock, pmix_cb_t);
PMIx_Deregister_event_handler(cb->ref, PMIx_Deregister_event_handler(cb->ref,
op_cbfunc, &lock); op_cbfunc, &lock);
@ -762,7 +764,6 @@ PMIX_EXPORT pmix_status_t PMIx_Group_invite_nb(const char grp[],
PMIX_RELEASE(cb); PMIX_RELEASE(cb);
return PMIX_ERR_NOMEM; return PMIX_ERR_NOMEM;
} }
PMIX_PROC_CREATE(cb->info[n].value.data.darray->array, nprocs);
memcpy(cb->info[n].value.data.darray->array, procs, nprocs * sizeof(pmix_proc_t)); memcpy(cb->info[n].value.data.darray->array, procs, nprocs * sizeof(pmix_proc_t));
++n; ++n;
/* mark that this only goes to non-default handlers */ /* mark that this only goes to non-default handlers */

6
opal/mca/pmix/pmix4x/pmix/src/common/pmix_control.c
Просмотреть файл

@ -1,9 +1,11 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -105,6 +107,8 @@ static void query_cbfunc(struct pmix_peer_t *peer,
/* release the caller */ /* release the caller */
if (NULL != cd->cbfunc) { if (NULL != cd->cbfunc) {
cd->cbfunc(results->status, results->info, results->ninfo, cd->cbdata, relcbfunc, results); cd->cbfunc(results->status, results->info, results->ninfo, cd->cbdata, relcbfunc, results);
} else {
PMIX_RELEASE(results);
} }
PMIX_RELEASE(cd); PMIX_RELEASE(cd);
} }

39
opal/mca/pmix/pmix4x/pmix/src/common/pmix_query.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved.
@ -140,7 +140,7 @@ PMIX_EXPORT pmix_status_t PMIx_Query_info_nb(pmix_query_t queries[], size_t nque
pmix_buffer_t *msg; pmix_buffer_t *msg;
pmix_status_t rc; pmix_status_t rc;
pmix_cb_t cb; pmix_cb_t cb;
size_t n, m, p; size_t n, p;
pmix_list_t results; pmix_list_t results;
pmix_kval_t *kv, *kvnxt; pmix_kval_t *kv, *kvnxt;
pmix_proc_t proc; pmix_proc_t proc;
@ -172,21 +172,19 @@ PMIX_EXPORT pmix_status_t PMIx_Query_info_nb(pmix_query_t queries[], size_t nque
memset(proc.nspace, 0, PMIX_MAX_NSLEN+1); memset(proc.nspace, 0, PMIX_MAX_NSLEN+1);
proc.rank = PMIX_RANK_INVALID; proc.rank = PMIX_RANK_INVALID;
for (n=0; n < nqueries; n++) { for (n=0; n < nqueries; n++) {
for (m=0; m < queries[n].nqual; m++) { for (p=0; p < queries[n].nqual; p++) {
if (NULL != queries[n].qualifiers) { if (PMIX_CHECK_KEY(&queries[n].qualifiers[p], PMIX_QUERY_REFRESH_CACHE)) {
for (p=0; p < queries[n].nqual; p++) { if (PMIX_INFO_TRUE(&queries[n].qualifiers[p])) {
if (PMIX_CHECK_KEY(&queries[n].qualifiers[p], PMIX_QUERY_REFRESH_CACHE)) { PMIX_LIST_DESTRUCT(&results);
PMIX_LIST_DESTRUCT(&results); goto query;
goto query;
} else if (PMIX_CHECK_KEY(&queries[n].qualifiers[p], PMIX_PROCID)) {
PMIX_LOAD_NSPACE(proc.nspace, queries[n].qualifiers[p].value.data.proc->nspace);
proc.rank = queries[n].qualifiers[p].value.data.proc->rank;
} else if (PMIX_CHECK_KEY(&queries[n].qualifiers[p], PMIX_NSPACE)) {
PMIX_LOAD_NSPACE(proc.nspace, queries[n].qualifiers[p].value.data.string);
} else if (PMIX_CHECK_KEY(&queries[n].qualifiers[p], PMIX_RANK)) {
proc.rank = queries[n].qualifiers[p].value.data.rank;
}
} }
} else if (PMIX_CHECK_KEY(&queries[n].qualifiers[p], PMIX_PROCID)) {
PMIX_LOAD_NSPACE(proc.nspace, queries[n].qualifiers[p].value.data.proc->nspace);
proc.rank = queries[n].qualifiers[p].value.data.proc->rank;
} else if (PMIX_CHECK_KEY(&queries[n].qualifiers[p], PMIX_NSPACE)) {
PMIX_LOAD_NSPACE(proc.nspace, queries[n].qualifiers[p].value.data.string);
} else if (PMIX_CHECK_KEY(&queries[n].qualifiers[p], PMIX_RANK)) {
proc.rank = queries[n].qualifiers[p].value.data.rank;
} }
} }
/* we get here if a refresh isn't required - first try a local /* we get here if a refresh isn't required - first try a local
@ -255,6 +253,7 @@ PMIX_EXPORT pmix_status_t PMIx_Query_info_nb(pmix_query_t queries[], size_t nque
/* regardless of the result of the query, we return /* regardless of the result of the query, we return
* PMIX_SUCCESS here to indicate that the operation * PMIX_SUCCESS here to indicate that the operation
* was accepted for processing */ * was accepted for processing */
PMIX_RELEASE_THREAD(&pmix_global_lock);
return PMIX_SUCCESS; return PMIX_SUCCESS;
@ -270,10 +269,10 @@ PMIX_EXPORT pmix_status_t PMIx_Query_info_nb(pmix_query_t queries[], size_t nque
} }
pmix_output_verbose(2, pmix_globals.debug_output, pmix_output_verbose(2, pmix_globals.debug_output,
"pmix:query handed to RM"); "pmix:query handed to RM");
pmix_host_server.query(&pmix_globals.myid, rc = pmix_host_server.query(&pmix_globals.myid,
queries, nqueries, queries, nqueries,
cbfunc, cbdata); cbfunc, cbdata);
return PMIX_SUCCESS; return rc;
} }
/* if we aren't connected, don't attempt to send */ /* if we aren't connected, don't attempt to send */

85
opal/mca/pmix/pmix4x/pmix/src/event/pmix_event_notification.c
Просмотреть файл

@ -1,7 +1,7 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2017-2018 Research Organization for Information Science * Copyright (c) 2017-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2017 IBM Corporation. All rights reserved. * Copyright (c) 2017 IBM Corporation. All rights reserved.
* *
@ -134,11 +134,11 @@ static pmix_status_t notify_event_cache(pmix_notify_caddy_t *cd)
} }
/* check the age */ /* check the age */
if (0 == j) { if (0 == j) {
etime = cd->ts; etime = pk->ts;
idx = j; idx = j;
} else { } else {
if (difftime(cd->ts, etime) < 0) { if (difftime(pk->ts, etime) < 0) {
etime = cd->ts; etime = pk->ts;
idx = j; idx = j;
} }
} }
@ -165,8 +165,9 @@ static pmix_status_t notify_server_of_event(pmix_status_t status,
pmix_cmd_t cmd = PMIX_NOTIFY_CMD; pmix_cmd_t cmd = PMIX_NOTIFY_CMD;
pmix_cb_t *cb; pmix_cb_t *cb;
pmix_event_chain_t *chain; pmix_event_chain_t *chain;
size_t n; size_t n, nleft;
pmix_notify_caddy_t *cd; pmix_notify_caddy_t *cd;
pmix_namespace_t *nptr, *tmp;
pmix_output_verbose(2, pmix_client_globals.event_output, pmix_output_verbose(2, pmix_client_globals.event_output,
"[%s:%d] client: notifying server %s:%d of status %s for range %s", "[%s:%d] client: notifying server %s:%d of status %s for range %s",
@ -252,6 +253,31 @@ static pmix_status_t notify_server_of_event(pmix_status_t status,
cd->ntargets = chain->ntargets; cd->ntargets = chain->ntargets;
PMIX_PROC_CREATE(cd->targets, cd->ntargets); PMIX_PROC_CREATE(cd->targets, cd->ntargets);
memcpy(cd->targets, chain->targets, cd->ntargets * sizeof(pmix_proc_t)); memcpy(cd->targets, chain->targets, cd->ntargets * sizeof(pmix_proc_t));
/* compute the number of targets that need to be notified */
nleft = 0;
for (n=0; n < cd->ntargets; n++) {
/* if this is a single proc, then increment by one */
if (PMIX_RANK_VALID >= cd->targets[n].rank) {
++nleft;
} else {
/* look up the nspace for this proc */
nptr = NULL;
PMIX_LIST_FOREACH(tmp, &pmix_server_globals.nspaces, pmix_namespace_t) {
if (PMIX_CHECK_NSPACE(tmp->nspace, cd->targets[n].nspace)) {
nptr = tmp;
break;
}
}
/* if we don't yet know it, then nothing to do */
if (NULL == nptr) {
nleft = SIZE_MAX;
break;
}
/* might notify all local members */
nleft += nptr->nlocalprocs;
}
}
cd->nleft = nleft;
} }
if (NULL != chain->affected) { if (NULL != chain->affected) {
cd->naffected = chain->naffected; cd->naffected = chain->naffected;
@ -810,13 +836,16 @@ static void _notify_client_event(int sd, short args, void *cbdata)
pmix_regevents_info_t *reginfoptr; pmix_regevents_info_t *reginfoptr;
pmix_peer_events_info_t *pr; pmix_peer_events_info_t *pr;
pmix_event_chain_t *chain; pmix_event_chain_t *chain;
size_t n; size_t n, nleft;
bool matched, holdcd; bool matched, holdcd;
pmix_buffer_t *bfr; pmix_buffer_t *bfr;
pmix_cmd_t cmd = PMIX_NOTIFY_CMD; pmix_cmd_t cmd = PMIX_NOTIFY_CMD;
pmix_status_t rc; pmix_status_t rc;
pmix_list_t trk; pmix_list_t trk;
pmix_namelist_t *nm; pmix_namelist_t *nm;
pmix_namespace_t *nptr, *tmp;
pmix_range_trkr_t rngtrk;
pmix_proc_t proc;
/* need to acquire the object from its originating thread */ /* need to acquire the object from its originating thread */
PMIX_ACQUIRE_OBJECT(cd); PMIX_ACQUIRE_OBJECT(cd);
@ -871,6 +900,31 @@ static void _notify_client_event(int sd, short args, void *cbdata)
cd->ntargets = chain->ntargets; cd->ntargets = chain->ntargets;
PMIX_PROC_CREATE(cd->targets, cd->ntargets); PMIX_PROC_CREATE(cd->targets, cd->ntargets);
memcpy(cd->targets, chain->targets, cd->ntargets * sizeof(pmix_proc_t)); memcpy(cd->targets, chain->targets, cd->ntargets * sizeof(pmix_proc_t));
/* compute the number of targets that need to be notified */
nleft = 0;
for (n=0; n < cd->ntargets; n++) {
/* if this is a single proc, then increment by one */
if (PMIX_RANK_VALID >= cd->targets[n].rank) {
++nleft;
} else {
/* look up the nspace for this proc */
nptr = NULL;
PMIX_LIST_FOREACH(tmp, &pmix_server_globals.nspaces, pmix_namespace_t) {
if (PMIX_CHECK_NSPACE(tmp->nspace, cd->targets[n].nspace)) {
nptr = tmp;
break;
}
}
/* if we don't yet know it, then nothing to do */
if (NULL == nptr) {
nleft = SIZE_MAX;
break;
}
/* might notify all local members */
nleft += nptr->nlocalprocs;
}
}
cd->nleft = nleft;
} }
if (NULL != chain->affected) { if (NULL != chain->affected) {
cd->naffected = chain->naffected; cd->naffected = chain->naffected;
@ -944,9 +998,12 @@ static void _notify_client_event(int sd, short args, void *cbdata)
memcpy(grp->members, cd->targets, cd->ntargets * sizeof(pmix_proc_t)); memcpy(grp->members, cd->targets, cd->ntargets * sizeof(pmix_proc_t));
pmix_list_append(&pmix_server_globals.groups, &grp->super); pmix_list_append(&pmix_server_globals.groups, &grp->super);
} }
holdcd = false; holdcd = false;
if (PMIX_RANGE_PROC_LOCAL != cd->range) { if (PMIX_RANGE_PROC_LOCAL != cd->range) {
PMIX_CONSTRUCT(&trk, pmix_list_t); PMIX_CONSTRUCT(&trk, pmix_list_t);
rngtrk.procs = NULL;
rngtrk.nprocs = 0;
/* cycle across our registered events and send the message to /* cycle across our registered events and send the message to
* any client who registered for it */ * any client who registered for it */
PMIX_LIST_FOREACH(reginfoptr, &pmix_server_globals.events, pmix_regevents_info_t) { PMIX_LIST_FOREACH(reginfoptr, &pmix_server_globals.events, pmix_regevents_info_t) {
@ -970,12 +1027,26 @@ static void _notify_client_event(int sd, short args, void *cbdata)
if (matched) { if (matched) {
continue; continue;
} }
/* check the range */
rngtrk.range = cd->range;
PMIX_LOAD_PROCID(&proc, pr->peer->info->pname.nspace, pr->peer->info->pname.rank);
if (!pmix_notify_check_range(&rngtrk, &proc)) {
continue;
}
/* if we were given specific targets, check if this is one */ /* if we were given specific targets, check if this is one */
if (NULL != cd->targets) { if (NULL != cd->targets) {
matched = false; matched = false;
for (n=0; n < cd->ntargets; n++) { for (n=0; n < cd->ntargets; n++) {
if (PMIX_CHECK_PROCID(&pr->peer->info->pname, &cd->targets[n])) { if (PMIX_CHECK_PROCID(&pr->peer->info->pname, &cd->targets[n])) {
matched = true; matched = true;
/* track the number of targets we have left to notify */
--cd->nleft;
/* if the event was cached and this is the last one,
* then evict this event from the cache */
if (0 == cd->nleft) {
pmix_hotel_checkout(&pmix_globals.notifications, cd->room);
PMIX_RELEASE(cd);
}
break; break;
} }
} }

16
opal/mca/pmix/pmix4x/pmix/src/event/pmix_event_registration.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2017-2018 Research Organization for Information Science * Copyright (c) 2017-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -388,15 +388,11 @@ static void check_cached_events(pmix_rshift_caddy_t *cd)
if (!found) { if (!found) {
continue; continue;
} }
/* if we were given specific targets, check if we are one */ /* if we were given specific targets, check if we are one */
if (NULL != ncd->targets) { if (NULL != ncd->targets) {
matched = false; matched = false;
for (n=0; n < ncd->ntargets; n++) { for (n=0; n < ncd->ntargets; n++) {
if (0 != strncmp(pmix_globals.myid.nspace, ncd->targets[n].nspace, PMIX_MAX_NSLEN)) { if (PMIX_CHECK_PROCID(&pmix_globals.myid, &ncd->targets[n])) {
continue;
}
if (PMIX_RANK_WILDCARD == ncd->targets[n].rank ||
pmix_globals.myid.rank == ncd->targets[n].rank) {
matched = true; matched = true;
break; break;
} }
@ -446,6 +442,12 @@ static void check_cached_events(pmix_rshift_caddy_t *cd)
} }
} }
} }
/* check this event out of the cache since we
* are processing it */
pmix_hotel_checkout(&pmix_globals.notifications, ncd->room);
/* release the storage */
PMIX_RELEASE(ncd);
/* we don't want this chain to propagate, so indicate it /* we don't want this chain to propagate, so indicate it
* should only be run as a single-shot */ * should only be run as a single-shot */
chain->endchain = true; chain->endchain = true;

4
opal/mca/pmix/pmix4x/pmix/src/hwloc/hwloc-internal.h
Просмотреть файл

@ -3,7 +3,7 @@
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* *
* Copyright (c) 2016-2018 Intel, Inc. All rights reserved. * Copyright (c) 2016-2019 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -22,7 +22,7 @@
#include <pmix_common.h> #include <pmix_common.h>
#if PMIX_HAVE_HWLOC #if PMIX_HAVE_HWLOC
#include <hwloc.h> #include PMIX_HWLOC_HEADER
#if HWLOC_API_VERSION < 0x00010b00 #if HWLOC_API_VERSION < 0x00010b00
#define HWLOC_OBJ_NUMANODE HWLOC_OBJ_NODE #define HWLOC_OBJ_NUMANODE HWLOC_OBJ_NODE

94
opal/mca/pmix/pmix4x/pmix/src/include/pmix_globals.c
Просмотреть файл

@ -1,9 +1,9 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2017 Research Organization for Information Science * Copyright (c) 2014-2017 Research Organization for Information Science
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84@gmail.com>.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved.
@ -360,32 +360,38 @@ void pmix_execute_epilog(pmix_epilog_t *epi)
pmix_cleanup_dir_t *cd, *cdnext; pmix_cleanup_dir_t *cd, *cdnext;
struct stat statbuf; struct stat statbuf;
int rc; int rc;
char **tmp;
size_t n;
/* start with any specified files */ /* start with any specified files */
PMIX_LIST_FOREACH_SAFE(cf, cfnext, &epi->cleanup_files, pmix_cleanup_file_t) { PMIX_LIST_FOREACH_SAFE(cf, cfnext, &epi->cleanup_files, pmix_cleanup_file_t) {
/* check the effective uid/gid of the file and ensure it /* check the effective uid/gid of the file and ensure it
* matches that of the peer - we do this to provide at least * matches that of the peer - we do this to provide at least
* some minimum level of protection */ * some minimum level of protection */
rc = stat(cf->path, &statbuf); tmp = pmix_argv_split(cf->path, ',');
if (0 != rc) { for (n=0; NULL != tmp[n]; n++) {
pmix_output_verbose(10, pmix_globals.debug_output, rc = stat(tmp[n], &statbuf);
"File %s failed to stat: %d", cf->path, rc); if (0 != rc) {
continue; pmix_output_verbose(10, pmix_globals.debug_output,
} "File %s failed to stat: %d", tmp[n], rc);
if (statbuf.st_uid != epi->uid || continue;
statbuf.st_gid != epi->gid) { }
pmix_output_verbose(10, pmix_globals.debug_output, if (statbuf.st_uid != epi->uid ||
"File %s uid/gid doesn't match: uid %lu(%lu) gid %lu(%lu)", statbuf.st_gid != epi->gid) {
cf->path, pmix_output_verbose(10, pmix_globals.debug_output,
(unsigned long)statbuf.st_uid, (unsigned long)epi->uid, "File %s uid/gid doesn't match: uid %lu(%lu) gid %lu(%lu)",
(unsigned long)statbuf.st_gid, (unsigned long)epi->gid); cf->path,
continue; (unsigned long)statbuf.st_uid, (unsigned long)epi->uid,
} (unsigned long)statbuf.st_gid, (unsigned long)epi->gid);
rc = unlink(cf->path); continue;
if (0 != rc) { }
pmix_output_verbose(10, pmix_globals.debug_output, rc = unlink(tmp[n]);
"File %s failed to unlink: %d", cf->path, rc); if (0 != rc) {
pmix_output_verbose(10, pmix_globals.debug_output,
"File %s failed to unlink: %d", tmp[n], rc);
}
} }
pmix_argv_free(tmp);
pmix_list_remove_item(&epi->cleanup_files, &cf->super); pmix_list_remove_item(&epi->cleanup_files, &cf->super);
PMIX_RELEASE(cf); PMIX_RELEASE(cf);
} }
@ -395,27 +401,31 @@ void pmix_execute_epilog(pmix_epilog_t *epi)
/* check the effective uid/gid of the file and ensure it /* check the effective uid/gid of the file and ensure it
* matches that of the peer - we do this to provide at least * matches that of the peer - we do this to provide at least
* some minimum level of protection */ * some minimum level of protection */
rc = stat(cd->path, &statbuf); tmp = pmix_argv_split(cd->path, ',');
if (0 != rc) { for (n=0; NULL != tmp[n]; n++) {
pmix_output_verbose(10, pmix_globals.debug_output, rc = stat(tmp[n], &statbuf);
"Directory %s failed to stat: %d", cd->path, rc); if (0 != rc) {
continue; pmix_output_verbose(10, pmix_globals.debug_output,
} "Directory %s failed to stat: %d", tmp[n], rc);
if (statbuf.st_uid != epi->uid || continue;
statbuf.st_gid != epi->gid) { }
pmix_output_verbose(10, pmix_globals.debug_output, if (statbuf.st_uid != epi->uid ||
"Directory %s uid/gid doesn't match: uid %lu(%lu) gid %lu(%lu)", statbuf.st_gid != epi->gid) {
cd->path, pmix_output_verbose(10, pmix_globals.debug_output,
(unsigned long)statbuf.st_uid, (unsigned long)epi->uid, "Directory %s uid/gid doesn't match: uid %lu(%lu) gid %lu(%lu)",
(unsigned long)statbuf.st_gid, (unsigned long)epi->gid); cd->path,
continue; (unsigned long)statbuf.st_uid, (unsigned long)epi->uid,
} (unsigned long)statbuf.st_gid, (unsigned long)epi->gid);
if ((statbuf.st_mode & S_IRWXU) == S_IRWXU) { continue;
dirpath_destroy(cd->path, cd, epi); }
} else { if ((statbuf.st_mode & S_IRWXU) == S_IRWXU) {
pmix_output_verbose(10, pmix_globals.debug_output, dirpath_destroy(tmp[n], cd, epi);
"Directory %s lacks permissions", cd->path); } else {
pmix_output_verbose(10, pmix_globals.debug_output,
"Directory %s lacks permissions", tmp[n]);
}
} }
pmix_argv_free(tmp);
pmix_list_remove_item(&epi->cleanup_dirs, &cd->super); pmix_list_remove_item(&epi->cleanup_dirs, &cd->super);
PMIX_RELEASE(cd); PMIX_RELEASE(cd);
} }

3
opal/mca/pmix/pmix4x/pmix/src/include/pmix_globals.h
Просмотреть файл

@ -10,7 +10,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) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -420,6 +420,7 @@ typedef struct {
*/ */
pmix_proc_t *targets; pmix_proc_t *targets;
size_t ntargets; size_t ntargets;
size_t nleft; // number of targets left to be notified
/* When generating a notification, the originator can /* When generating a notification, the originator can
* specify the range of procs affected by this event. * specify the range of procs affected by this event.
* For example, when creating a JOB_TERMINATED event, * For example, when creating a JOB_TERMINATED event,

6
opal/mca/pmix/pmix4x/pmix/src/mca/bfrops/v12/unpack.c
Просмотреть файл

@ -10,7 +10,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) 2012 Los Alamos National Security, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
@ -672,7 +672,9 @@ static pmix_status_t unpack_val(pmix_buffer_t *buffer, pmix_value_t *val)
case PMIX_INFO_ARRAY: case PMIX_INFO_ARRAY:
/* we don't know anything about info array's so we /* we don't know anything about info array's so we
* have to convert this to a data array */ * have to convert this to a data array */
PMIX_DATA_ARRAY_CREATE(val->data.darray, m, PMIX_INFO); val->data.darray = (pmix_data_array_t*)calloc(1, sizeof(pmix_data_array_t));
val->data.darray->type = PMIX_INFO_ARRAY;
val->data.darray->size = m;
/* unpack into it */ /* unpack into it */
if (PMIX_SUCCESS != (ret = pmix12_bfrop_unpack_buffer(buffer, &val->data.darray->array, &m, PMIX_INFO_ARRAY))) { if (PMIX_SUCCESS != (ret = pmix12_bfrop_unpack_buffer(buffer, &val->data.darray->array, &m, PMIX_INFO_ARRAY))) {
return ret; return ret;

6
opal/mca/pmix/pmix4x/pmix/src/mca/bfrops/v20/unpack.c
Просмотреть файл

@ -10,7 +10,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) 2012 Los Alamos National Security, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
@ -758,7 +758,9 @@ pmix_status_t pmix20_bfrop_unpack_status(pmix_buffer_t *buffer, void *dest,
case PMIX_INFO_ARRAY: case PMIX_INFO_ARRAY:
/* we don't know anything about info array's so we /* we don't know anything about info array's so we
* have to convert this to a data array */ * have to convert this to a data array */
PMIX_DATA_ARRAY_CREATE(val->data.darray, m, PMIX_INFO); val->data.darray = (pmix_data_array_t*)calloc(1, sizeof(pmix_data_array_t));
val->data.darray->type = PMIX_INFO_ARRAY;
val->data.darray->size = m;
/* unpack into it */ /* unpack into it */
if (PMIX_SUCCESS != (ret = pmix20_bfrop_unpack_buffer(buffer, &val->data.darray->array, &m, PMIX_INFO_ARRAY))) { if (PMIX_SUCCESS != (ret = pmix20_bfrop_unpack_buffer(buffer, &val->data.darray->array, &m, PMIX_INFO_ARRAY))) {
return ret; return ret;

5
opal/mca/pmix/pmix4x/pmix/src/mca/common/dstore/dstore_base.c
Просмотреть файл

@ -1,9 +1,9 @@
/* /*
* Copyright (c) 2015-2018 Intel, Inc. All rights reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2016-2018 IBM Corporation. All rights reserved. * Copyright (c) 2016-2018 IBM Corporation. All rights reserved.
* Copyright (c) 2016-2018 Mellanox Technologies, Inc. * Copyright (c) 2016-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2018 Research Organization for Information Science * Copyright (c) 2018-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
@ -1782,6 +1782,7 @@ PMIX_EXPORT void pmix_common_dstor_finalize(pmix_common_dstore_ctx_t *ds_ctx)
} }
free(ds_ctx->ds_name); free(ds_ctx->ds_name);
free(ds_ctx->base_path); free(ds_ctx->base_path);
free(ds_ctx);
} }
static pmix_status_t _dstore_store_nolock(pmix_common_dstore_ctx_t *ds_ctx, static pmix_status_t _dstore_store_nolock(pmix_common_dstore_ctx_t *ds_ctx,

11
opal/mca/pmix/pmix4x/pmix/src/mca/gds/ds21/gds_ds21_file.c
Просмотреть файл

@ -1,7 +1,9 @@
/* /*
* Copyright (c) 2018 Mellanox Technologies, Inc. * Copyright (c) 2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* * Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2019 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -17,10 +19,15 @@
#include "src/mca/common/dstore/dstore_file.h" #include "src/mca/common/dstore/dstore_file.h"
#include "gds_ds21_file.h" #include "gds_ds21_file.h"
/* TODO: adapt to size_t size */ #if 8 > SIZEOF_SIZE_T
#define ESH_REGION_EXTENSION_FLG 0x80000000
#define ESH_REGION_INVALIDATED_FLG 0x40000000
#define ESH_REGION_SIZE_MASK 0x3FFFFFFF
#else
#define ESH_REGION_EXTENSION_FLG 0x8000000000000000 #define ESH_REGION_EXTENSION_FLG 0x8000000000000000
#define ESH_REGION_INVALIDATED_FLG 0x4000000000000000 #define ESH_REGION_INVALIDATED_FLG 0x4000000000000000
#define ESH_REGION_SIZE_MASK 0x3FFFFFFFFFFFFFFF #define ESH_REGION_SIZE_MASK 0x3FFFFFFFFFFFFFFF
#endif
#define ESH_KV_SIZE_V21(addr) \ #define ESH_KV_SIZE_V21(addr) \
__pmix_attribute_extension__ ({ \ __pmix_attribute_extension__ ({ \

15
opal/mca/pmix/pmix4x/pmix/src/mca/pnet/tcp/pnet_tcp.c
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Intel, Inc. All rights reserved. * Copyright (c) 2018-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2018 Research Organization for Information Science * Copyright (c) 2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* *
@ -749,7 +749,12 @@ static pmix_status_t setup_local_network(pmix_namespace_t *nptr,
PMIX_BFROPS_UNPACK(rc, pmix_globals.mypeer, PMIX_BFROPS_UNPACK(rc, pmix_globals.mypeer,
&bkt, &nkvals, &cnt, PMIX_SIZE); &bkt, &nkvals, &cnt, PMIX_SIZE);
/* setup the info array */ /* setup the info array */
PMIX_INFO_CREATE(jinfo, nkvals); PMIX_INFO_CONSTRUCT(&stinfo);
pmix_strncpy(stinfo.key, idkey, PMIX_MAX_KEYLEN);
stinfo.value.type = PMIX_DATA_ARRAY;
PMIX_DATA_ARRAY_CREATE(stinfo.value.data.darray, nkvals, PMIX_INFO);
jinfo = (pmix_info_t*)stinfo.value.data.darray->array;
/* cycle thru the blob and extract the kvals */ /* cycle thru the blob and extract the kvals */
kv = PMIX_NEW(pmix_kval_t); kv = PMIX_NEW(pmix_kval_t);
cnt = 1; cnt = 1;
@ -787,12 +792,6 @@ static pmix_status_t setup_local_network(pmix_namespace_t *nptr,
PMIX_INFO_FREE(jinfo, nkvals); PMIX_INFO_FREE(jinfo, nkvals);
return PMIX_ERR_BAD_PARAM; return PMIX_ERR_BAD_PARAM;
} }
/* the data gets stored as a pmix_data_array_t on the provided key */
PMIX_INFO_CONSTRUCT(&stinfo);
pmix_strncpy(stinfo.key, idkey, PMIX_MAX_KEYLEN);
stinfo.value.type = PMIX_DATA_ARRAY;
PMIX_DATA_ARRAY_CREATE(stinfo.value.data.darray, nkvals, PMIX_INFO);
stinfo.value.data.darray->array = jinfo;
/* cache the info on the job */ /* cache the info on the job */
PMIX_GDS_CACHE_JOB_INFO(rc, pmix_globals.mypeer, nptr, PMIX_GDS_CACHE_JOB_INFO(rc, pmix_globals.mypeer, nptr,

20
opal/mca/pmix/pmix4x/pmix/src/mca/pnet/test/pnet_test.c
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2018 Intel, Inc. All rights reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
@ -345,8 +345,13 @@ static pmix_status_t setup_local_network(pmix_namespace_t *nptr,
cnt = 1; cnt = 1;
PMIX_BFROPS_UNPACK(rc, pmix_globals.mypeer, PMIX_BFROPS_UNPACK(rc, pmix_globals.mypeer,
&bkt, &nkvals, &cnt, PMIX_SIZE); &bkt, &nkvals, &cnt, PMIX_SIZE);
/* setup the info array */ /* the data gets stored as a pmix_data_array_t on the provided key */
PMIX_INFO_CREATE(jinfo, nkvals); PMIX_INFO_CONSTRUCT(&stinfo);
pmix_strncpy(stinfo.key, idkey, PMIX_MAX_KEYLEN);
stinfo.value.type = PMIX_DATA_ARRAY;
PMIX_DATA_ARRAY_CREATE(stinfo.value.data.darray, nkvals, PMIX_INFO);
jinfo = (pmix_info_t*)stinfo.value.data.darray->array;
/* cycle thru the blob and extract the kvals */ /* cycle thru the blob and extract the kvals */
kv = PMIX_NEW(pmix_kval_t); kv = PMIX_NEW(pmix_kval_t);
cnt = 1; cnt = 1;
@ -384,14 +389,7 @@ static pmix_status_t setup_local_network(pmix_namespace_t *nptr,
PMIX_INFO_FREE(jinfo, nkvals); PMIX_INFO_FREE(jinfo, nkvals);
return PMIX_ERR_BAD_PARAM; return PMIX_ERR_BAD_PARAM;
} }
/* the data gets stored as a pmix_data_array_t on the provided key */ /* cache the info on the job */
PMIX_INFO_CONSTRUCT(&stinfo);
pmix_strncpy(stinfo.key, idkey, PMIX_MAX_KEYLEN);
stinfo.value.type = PMIX_DATA_ARRAY;
PMIX_DATA_ARRAY_CREATE(stinfo.value.data.darray, nkvals, PMIX_INFO);
stinfo.value.data.darray->array = jinfo;
/* cache the info on the job */
PMIX_GDS_CACHE_JOB_INFO(rc, pmix_globals.mypeer, nptr, PMIX_GDS_CACHE_JOB_INFO(rc, pmix_globals.mypeer, nptr,
&stinfo, 1); &stinfo, 1);
PMIX_INFO_DESTRUCT(&stinfo); PMIX_INFO_DESTRUCT(&stinfo);

31
opal/mca/pmix/pmix4x/pmix/src/mca/ptl/base/ptl_base_sendrecv.c
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2014 Artem Y. Polyakov <artpol84@gmail.com>.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015-2017 Research Organization for Information Science * Copyright (c) 2015-2017 Research Organization for Information Science
@ -62,6 +62,12 @@ static void _timeout(int sd, short args, void *cbdata)
PMIX_RELEASE(trk); PMIX_RELEASE(trk);
} }
static void lcfn(pmix_status_t status, void *cbdata)
{
pmix_peer_t *peer = (pmix_peer_t*)cbdata;
PMIX_RELEASE(peer);
}
void pmix_ptl_base_lost_connection(pmix_peer_t *peer, pmix_status_t err) void pmix_ptl_base_lost_connection(pmix_peer_t *peer, pmix_status_t err)
{ {
pmix_server_trkr_t *trk, *tnxt; pmix_server_trkr_t *trk, *tnxt;
@ -71,6 +77,8 @@ void pmix_ptl_base_lost_connection(pmix_peer_t *peer, pmix_status_t err)
pmix_buffer_t buf; pmix_buffer_t buf;
pmix_ptl_hdr_t hdr; pmix_ptl_hdr_t hdr;
struct timeval tv = {1200, 0}; struct timeval tv = {1200, 0};
pmix_proc_t proc;
pmix_status_t rc;
/* stop all events */ /* stop all events */
if (peer->recv_ev_active) { if (peer->recv_ev_active) {
@ -197,14 +205,29 @@ void pmix_ptl_base_lost_connection(pmix_peer_t *peer, pmix_status_t err)
* we are just seeing their connection go away * we are just seeing their connection go away
* when they terminate - so do not generate * when they terminate - so do not generate
* an event. If not, then we do */ * an event. If not, then we do */
PMIX_REPORT_EVENT(err, peer, PMIX_RANGE_NAMESPACE, _notify_complete); PMIX_REPORT_EVENT(err, peer, PMIX_RANGE_PROC_LOCAL, _notify_complete);
} }
/* now decrease the refcount - might actually free the object */ /* now decrease the refcount - might actually free the object */
PMIX_RELEASE(peer->info); PMIX_RELEASE(peer->info);
/* be sure to let the host know that the tool or client
* is gone - otherwise, it won't know to cleanup the
* resources it allocated to it */
if (NULL != pmix_host_server.client_finalized && !peer->finalized) {
pmix_strncpy(proc.nspace, peer->info->pname.nspace, PMIX_MAX_NSLEN);
proc.rank = peer->info->pname.rank;
/* now tell the host server */
rc = pmix_host_server.client_finalized(&proc, peer->info->server_object,
lcfn, peer);
if (PMIX_SUCCESS == rc) {
/* we will release the peer when the server calls us back */
peer->finalized = true;
return;
}
}
/* mark the peer as "gone" since a release doesn't guarantee /* mark the peer as "gone" since a release doesn't guarantee
* that the peer object doesn't persist */ * that the peer object doesn't persist */
peer->finalized = true; peer->finalized = true;
/* Release peer info */ /* Release peer info */
PMIX_RELEASE(peer); PMIX_RELEASE(peer);
} else { } else {
@ -234,7 +257,7 @@ void pmix_ptl_base_lost_connection(pmix_peer_t *peer, pmix_status_t err)
PMIX_DESTRUCT(&buf); PMIX_DESTRUCT(&buf);
/* if I called finalize, then don't generate an event */ /* if I called finalize, then don't generate an event */
if (!pmix_globals.mypeer->finalized) { if (!pmix_globals.mypeer->finalized) {
PMIX_REPORT_EVENT(err, pmix_client_globals.myserver, PMIX_RANGE_LOCAL, _notify_complete); PMIX_REPORT_EVENT(err, pmix_client_globals.myserver, PMIX_RANGE_PROC_LOCAL, _notify_complete);
} }
} }
} }

208
opal/mca/pmix/pmix4x/pmix/src/mca/ptl/tcp/ptl_tcp.c
Просмотреть файл

@ -13,7 +13,7 @@
* Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2018 IBM Corporation. All rights reserved. * Copyright (c) 2018 IBM Corporation. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -43,7 +43,12 @@
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#ifdef HAVE_DIRENT_H
#include <dirent.h> #include <dirent.h>
#endif
#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
#endif
#include "src/include/pmix_globals.h" #include "src/include/pmix_globals.h"
#include "src/include/pmix_socket_errno.h" #include "src/include/pmix_socket_errno.h"
@ -133,7 +138,7 @@ static pmix_status_t connect_to_peer(struct pmix_peer_t *peer,
pid_t pid = 0, mypid; pid_t pid = 0, mypid;
pmix_list_t ilist; pmix_list_t ilist;
pmix_info_caddy_t *kv; pmix_info_caddy_t *kv;
pmix_info_t *iptr = NULL, mypidinfo; pmix_info_t *iptr = NULL, mypidinfo, mycmdlineinfo, launcher;
size_t niptr = 0; size_t niptr = 0;
pmix_kval_t *urikv = NULL; pmix_kval_t *urikv = NULL;
@ -303,6 +308,97 @@ static pmix_status_t connect_to_peer(struct pmix_peer_t *peer,
kv->info = &mypidinfo; kv->info = &mypidinfo;
pmix_list_append(&ilist, &kv->super); pmix_list_append(&ilist, &kv->super);
/* if I am a launcher, tell them so */
if (PMIX_PROC_IS_LAUNCHER(pmix_globals.mypeer)) {
kv = PMIX_NEW(pmix_info_caddy_t);
PMIX_INFO_LOAD(&launcher, PMIX_LAUNCHER, NULL, PMIX_BOOL);
kv->info = &launcher;
pmix_list_append(&ilist, &kv->super);
}
/* add our cmd line to the array */
#if PMIX_HAVE_APPLE
int mib[3], argmax, nargs, num;
size_t size;
char *procargs, *cp, *cptr;
char **stack = NULL;
/* Get the maximum process arguments size. */
mib[0] = CTL_KERN;
mib[1] = KERN_ARGMAX;
size = sizeof(argmax);
if (sysctl(mib, 2, &argmax, &size, NULL, 0) == -1) {
fprintf(stderr, "sysctl() argmax failed\n");
return -1;
}
/* Allocate space for the arguments. */
procargs = (char *)malloc(argmax);
if (procargs == NULL)
return -1;
/* Make a sysctl() call to get the raw argument space of the process. */
mib[0] = CTL_KERN;
mib[1] = KERN_PROCARGS2;
mib[2] = getpid();
size = (size_t)argmax;
if (sysctl(mib, 3, procargs, &size, NULL, 0) == -1) {
fprintf(stderr, "Lacked permissions\n");;
return 0;
}
memcpy(&nargs, procargs, sizeof(nargs));
/* this points to the executable - skip over that to get the rest */
cp = procargs + sizeof(nargs);
cp += strlen(cp);
/* this is the first argv */
pmix_argv_append_nosize(&stack, cp);
/* skip any embedded NULLs */
while (cp < &procargs[size] && '\0' == *cp) {
++cp;
}
if (cp != &procargs[size]) {
/* from this point, we have the argv separated by NULLs - split them out */
cptr = cp;
num = 0;
while (cp < &procargs[size] && num < nargs) {
if ('\0' == *cp) {
pmix_argv_append_nosize(&stack, cptr);
++cp; // skip over the NULL
cptr = cp;
++num;
} else {
++cp;
}
}
}
p = pmix_argv_join(stack, ' ');
pmix_argv_free(stack);
free(procargs);
#else
char tmp[512];
FILE *fp;
/* open the pid's info file */
snprintf(tmp, 512, "/proc/%lu/cmdline", (unsigned long)mypid);
fp = fopen(tmp, "r");
if (NULL != fp) {
/* read the cmd line */
fgets(tmp, 512, fp);
fclose(fp);
p = strdup(tmp);
}
#endif
/* pass it along */
kv = PMIX_NEW(pmix_info_caddy_t);
PMIX_INFO_LOAD(&mycmdlineinfo, PMIX_CMD_LINE, p, PMIX_STRING);
kv->info = &mycmdlineinfo;
pmix_list_append(&ilist, &kv->super);
free(p);
/* if we need to pass anything, setup an array */ /* if we need to pass anything, setup an array */
if (0 < (niptr = pmix_list_get_size(&ilist))) { if (0 < (niptr = pmix_list_get_size(&ilist))) {
PMIX_INFO_CREATE(iptr, niptr); PMIX_INFO_CREATE(iptr, niptr);
@ -460,6 +556,55 @@ static pmix_status_t connect_to_peer(struct pmix_peer_t *peer,
return PMIX_ERR_UNREACH; return PMIX_ERR_UNREACH;
} }
/* if they asked for system-level first or only, we start there */
if (system_level || system_level_only) {
if (0 > asprintf(&filename, "%s/pmix.sys.%s", mca_ptl_tcp_component.system_tmpdir, myhost)) {
if (NULL != iptr) {
PMIX_INFO_FREE(iptr, niptr);
}
return PMIX_ERR_NOMEM;
}
pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
"ptl:tcp:tool looking for system server at %s",
filename);
/* try to read the file */
rc = parse_uri_file(filename, &suri, &nspace, &rank);
free(filename);
if (PMIX_SUCCESS == rc) {
pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
"ptl:tcp:tool attempt connect to system server at %s", suri);
/* go ahead and try to connect */
if (PMIX_SUCCESS == try_connect(suri, &sd, iptr, niptr)) {
/* don't free nspace - we will use it below */
if (NULL != iptr) {
PMIX_INFO_FREE(iptr, niptr);
}
/* save the URI for storage */
urikv = PMIX_NEW(pmix_kval_t);
urikv->key = strdup(PMIX_SERVER_URI);
PMIX_VALUE_CREATE(urikv->value, 1);
PMIX_VALUE_LOAD(urikv->value, suri, PMIX_STRING);
goto complete;
}
free(nspace);
}
}
/* we get here if they either didn't ask for a system-level connection,
* or they asked for it and it didn't succeed. If they _only_ wanted
* a system-level connection, then we are done */
if (system_level_only) {
pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
"ptl:tcp: connecting to system failed");
if (NULL != suri) {
free(suri);
}
if (NULL != iptr) {
PMIX_INFO_FREE(iptr, niptr);
}
return PMIX_ERR_UNREACH;
}
/* if they gave us a pid, then look for it */ /* if they gave us a pid, then look for it */
if (0 != pid) { if (0 != pid) {
if (NULL != server_nspace) { if (NULL != server_nspace) {
@ -541,55 +686,6 @@ static pmix_status_t connect_to_peer(struct pmix_peer_t *peer,
return PMIX_ERR_UNREACH; return PMIX_ERR_UNREACH;
} }
/* if they asked for system-level, we start there */
if (system_level || system_level_only) {
if (0 > asprintf(&filename, "%s/pmix.sys.%s", mca_ptl_tcp_component.system_tmpdir, myhost)) {
if (NULL != iptr) {
PMIX_INFO_FREE(iptr, niptr);
}
return PMIX_ERR_NOMEM;
}
pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
"ptl:tcp:tool looking for system server at %s",
filename);
/* try to read the file */
rc = parse_uri_file(filename, &suri, &nspace, &rank);
free(filename);
if (PMIX_SUCCESS == rc) {
pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
"ptl:tcp:tool attempt connect to system server at %s", suri);
/* go ahead and try to connect */
if (PMIX_SUCCESS == try_connect(suri, &sd, iptr, niptr)) {
/* don't free nspace - we will use it below */
if (NULL != iptr) {
PMIX_INFO_FREE(iptr, niptr);
}
/* save the URI for storage */
urikv = PMIX_NEW(pmix_kval_t);
urikv->key = strdup(PMIX_SERVER_URI);
PMIX_VALUE_CREATE(urikv->value, 1);
PMIX_VALUE_LOAD(urikv->value, suri, PMIX_STRING);
goto complete;
}
free(nspace);
}
}
/* we get here if they either didn't ask for a system-level connection,
* or they asked for it and it didn't succeed. If they _only_ wanted
* a system-level connection, then we are done */
if (system_level_only) {
pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
"ptl:tcp: connecting to system failed");
if (NULL != suri) {
free(suri);
}
if (NULL != iptr) {
PMIX_INFO_FREE(iptr, niptr);
}
return PMIX_ERR_UNREACH;
}
/* they didn't give us a pid, so we will search to see what session-level /* they didn't give us a pid, so we will search to see what session-level
* tools are available to this user. We will take the first connection * tools are available to this user. We will take the first connection
* that succeeds - this is based on the likelihood that there is only * that succeeds - this is based on the likelihood that there is only
@ -1253,9 +1349,13 @@ static pmix_status_t recv_connect_ack(int sd, uint8_t myflag)
tv.tv_sec = mca_ptl_tcp_component.handshake_wait_time; tv.tv_sec = mca_ptl_tcp_component.handshake_wait_time;
tv.tv_usec = 0; tv.tv_usec = 0;
if (0 != setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv))) { if (0 != setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv))) {
pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, if (ENOPROTOOPT == errno || EOPNOTSUPP == errno) {
"pmix: recv_connect_ack could not setsockopt SO_RCVTIMEO"); sockopt = false;
return PMIX_ERR_UNREACH; } else {
pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
"pmix: recv_connect_ack could not setsockopt SO_RCVTIMEO");
return PMIX_ERR_UNREACH;
}
} }
} }

4
opal/mca/pmix/pmix4x/pmix/src/mca/ptl/tcp/ptl_tcp_component.c
Просмотреть файл

@ -12,7 +12,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2016-2018 Intel, Inc. All rights reserved. * Copyright (c) 2016-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2017-2018 Research Organization for Information Science * Copyright (c) 2017-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2018 IBM Corporation. All rights reserved. * Copyright (c) 2018 IBM Corporation. All rights reserved.
@ -1454,7 +1454,7 @@ static void connection_handler(int sd, short args, void *cbdata)
/* and the group id */ /* and the group id */
PMIX_INFO_LOAD(&pnd->info[n], PMIX_GRPID, &pnd->gid, PMIX_UINT32); PMIX_INFO_LOAD(&pnd->info[n], PMIX_GRPID, &pnd->gid, PMIX_UINT32);
++n; ++n;
/* if we have it, pass along our ID */ /* if we have it, pass along their ID */
if (!pnd->need_id) { if (!pnd->need_id) {
PMIX_INFO_LOAD(&pnd->info[n], PMIX_NSPACE, nspace, PMIX_STRING); PMIX_INFO_LOAD(&pnd->info[n], PMIX_NSPACE, nspace, PMIX_STRING);
++n; ++n;

10
opal/mca/pmix/pmix4x/pmix/src/runtime/pmix_params.c
Просмотреть файл

@ -21,7 +21,7 @@
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2015-2018 Mellanox Technologies, Inc. * Copyright (c) 2015-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016-2018 Intel, Inc. All rights reserved. * Copyright (c) 2016-2019 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -258,6 +258,14 @@ pmix_status_t pmix_register_params(void)
PMIX_INFO_LVL_1, PMIX_MCA_BASE_VAR_SCOPE_ALL, PMIX_INFO_LVL_1, PMIX_MCA_BASE_VAR_SCOPE_ALL,
&pmix_globals.event_eviction_time); &pmix_globals.event_eviction_time);
/* max number of IOF messages to cache */
pmix_server_globals.max_iof_cache = 1024 * 1024;
(void) pmix_mca_base_var_register ("pmix", "pmix", "max", "iof_cache",
"Maximum number of IOF messages to cache",
PMIX_MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
PMIX_INFO_LVL_1, PMIX_MCA_BASE_VAR_SCOPE_ALL,
&pmix_server_globals.max_iof_cache);
return PMIX_SUCCESS; return PMIX_SUCCESS;
} }

258
opal/mca/pmix/pmix4x/pmix/src/server/pmix_server.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2018 Research Organization for Information Science * Copyright (c) 2014-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84@gmail.com>.
@ -87,18 +87,8 @@ static char *gds_mode = NULL;
static pid_t mypid; static pid_t mypid;
// local functions for connection support // local functions for connection support
static void iof_eviction_cbfunc(struct pmix_hotel_t *hotel,
int room_num,
void *occupant)
{
pmix_setup_caddy_t *cache = (pmix_setup_caddy_t*)occupant;
PMIX_RELEASE(cache);
}
pmix_status_t pmix_server_initialize(void) pmix_status_t pmix_server_initialize(void)
{ {
pmix_status_t rc;
/* setup the server-specific globals */ /* setup the server-specific globals */
PMIX_CONSTRUCT(&pmix_server_globals.clients, pmix_pointer_array_t); PMIX_CONSTRUCT(&pmix_server_globals.clients, pmix_pointer_array_t);
pmix_pointer_array_init(&pmix_server_globals.clients, 1, INT_MAX, 1); pmix_pointer_array_init(&pmix_server_globals.clients, 1, INT_MAX, 1);
@ -109,15 +99,7 @@ pmix_status_t pmix_server_initialize(void)
PMIX_CONSTRUCT(&pmix_server_globals.local_reqs, pmix_list_t); PMIX_CONSTRUCT(&pmix_server_globals.local_reqs, pmix_list_t);
PMIX_CONSTRUCT(&pmix_server_globals.nspaces, pmix_list_t); PMIX_CONSTRUCT(&pmix_server_globals.nspaces, pmix_list_t);
PMIX_CONSTRUCT(&pmix_server_globals.groups, pmix_list_t); PMIX_CONSTRUCT(&pmix_server_globals.groups, pmix_list_t);
PMIX_CONSTRUCT(&pmix_server_globals.iof, pmix_hotel_t); PMIX_CONSTRUCT(&pmix_server_globals.iof, pmix_list_t);
rc = pmix_hotel_init(&pmix_server_globals.iof, PMIX_IOF_HOTEL_SIZE,
pmix_globals.evbase, PMIX_IOF_MAX_STAY,
iof_eviction_cbfunc);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE_THREAD(&pmix_global_lock);
return rc;
}
pmix_output_verbose(2, pmix_server_globals.base_output, pmix_output_verbose(2, pmix_server_globals.base_output,
"pmix:server init called"); "pmix:server init called");
@ -445,7 +427,6 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)
int i; int i;
pmix_peer_t *peer; pmix_peer_t *peer;
pmix_namespace_t *ns; pmix_namespace_t *ns;
pmix_setup_caddy_t *cd;
PMIX_ACQUIRE_THREAD(&pmix_global_lock); PMIX_ACQUIRE_THREAD(&pmix_global_lock);
if (pmix_globals.init_cntr <= 0) { if (pmix_globals.init_cntr <= 0) {
@ -473,14 +454,6 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)
pmix_ptl_base_stop_listening(); pmix_ptl_base_stop_listening();
/* cleanout any IOF */
for (i=0; i < PMIX_IOF_HOTEL_SIZE; i++) {
pmix_hotel_checkout_and_return_occupant(&pmix_server_globals.iof, i, (void**)&cd);
if (NULL != cd) {
PMIX_RELEASE(cd);
}
}
PMIX_DESTRUCT(&pmix_server_globals.iof);
for (i=0; i < pmix_server_globals.clients.size; i++) { for (i=0; i < pmix_server_globals.clients.size; i++) {
if (NULL != (peer = (pmix_peer_t*)pmix_pointer_array_get_item(&pmix_server_globals.clients, i))) { if (NULL != (peer = (pmix_peer_t*)pmix_pointer_array_get_item(&pmix_server_globals.clients, i))) {
/* ensure that we do the specified cleanup - if this is an /* ensure that we do the specified cleanup - if this is an
@ -504,6 +477,7 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)
} }
PMIX_LIST_DESTRUCT(&pmix_server_globals.nspaces); PMIX_LIST_DESTRUCT(&pmix_server_globals.nspaces);
PMIX_LIST_DESTRUCT(&pmix_server_globals.groups); PMIX_LIST_DESTRUCT(&pmix_server_globals.groups);
PMIX_LIST_DESTRUCT(&pmix_server_globals.iof);
pmix_hwloc_cleanup(); pmix_hwloc_cleanup();
@ -733,6 +707,11 @@ void pmix_server_purge_events(pmix_peer_t *peer,
} }
} }
} }
if (NULL != peer) {
/* ensure we honor any peer-level epilog requests */
pmix_execute_epilog(&peer->epilog);
}
} }
static void _deregister_nspace(int sd, short args, void *cbdata) static void _deregister_nspace(int sd, short args, void *cbdata)
@ -759,7 +738,10 @@ static void _deregister_nspace(int sd, short args, void *cbdata)
/* release this nspace */ /* release this nspace */
PMIX_LIST_FOREACH(tmp, &pmix_server_globals.nspaces, pmix_namespace_t) { PMIX_LIST_FOREACH(tmp, &pmix_server_globals.nspaces, pmix_namespace_t) {
if (0 == strcmp(tmp->nspace, cd->proc.nspace)) { if (PMIX_CHECK_NSPACE(tmp->nspace, cd->proc.nspace)) {
/* perform any nspace-level epilog */
pmix_execute_epilog(&tmp->epilog);
/* remove and release it */
pmix_list_remove_item(&pmix_server_globals.nspaces, &tmp->super); pmix_list_remove_item(&pmix_server_globals.nspaces, &tmp->super);
PMIX_RELEASE(tmp); PMIX_RELEASE(tmp);
break; break;
@ -1172,6 +1154,8 @@ static void _deregister_client(int sd, short args, void *cbdata)
pmix_pnet.child_finalized(&cd->proc); pmix_pnet.child_finalized(&cd->proc);
pmix_psensor.stop(peer, NULL); pmix_psensor.stop(peer, NULL);
} }
/* honor any registered epilogs */
pmix_execute_epilog(&peer->epilog);
/* ensure we close the socket to this peer so we don't /* ensure we close the socket to this peer so we don't
* generate "connection lost" events should it be * generate "connection lost" events should it be
* subsequently "killed" by the host */ * subsequently "killed" by the host */
@ -1712,7 +1696,7 @@ static void _iofdeliver(int sd, short args, void *cbdata)
pmix_buffer_t *msg; pmix_buffer_t *msg;
bool found = false; bool found = false;
bool cached = false; bool cached = false;
int ignore; pmix_iof_cache_t *iof;
pmix_output_verbose(2, pmix_server_globals.iof_output, pmix_output_verbose(2, pmix_server_globals.iof_output,
"PMIX:SERVER delivering IOF from %s on channel %0x", "PMIX:SERVER delivering IOF from %s on channel %0x",
@ -1726,8 +1710,7 @@ static void _iofdeliver(int sd, short args, void *cbdata)
continue; continue;
} }
/* see if the source matches the request */ /* see if the source matches the request */
if (0 != strncmp(cd->procs->nspace, req->pname.nspace, PMIX_MAX_NSLEN) || if (!PMIX_CHECK_PROCID(cd->procs, &req->pname)) {
(PMIX_RANK_WILDCARD != req->pname.rank && cd->procs->rank != req->pname.rank)) {
continue; continue;
} }
/* never forward back to the source! This can happen if the source /* never forward back to the source! This can happen if the source
@ -1736,8 +1719,7 @@ static void _iofdeliver(int sd, short args, void *cbdata)
if (NULL == req->peer->info || req->peer->finalized) { if (NULL == req->peer->info || req->peer->finalized) {
continue; continue;
} }
if (0 == strncmp(cd->procs->nspace, req->peer->info->pname.nspace, PMIX_MAX_NSLEN) && if (PMIX_CHECK_PROCID(cd->procs, &req->peer->info->pname)) {
cd->procs->rank == req->peer->info->pname.rank) {
continue; continue;
} }
found = true; found = true;
@ -1778,15 +1760,21 @@ static void _iofdeliver(int sd, short args, void *cbdata)
/* if nobody has registered for this yet, then cache it */ /* if nobody has registered for this yet, then cache it */
if (!found) { if (!found) {
/* add this output to our hotel so it is cached until someone pmix_output_verbose(2, pmix_server_globals.iof_output,
* registers to receive it */ "PMIx:SERVER caching IOF");
if (PMIX_SUCCESS != (rc = pmix_hotel_checkin(&pmix_server_globals.iof, cd, &ignore))) { if (pmix_server_globals.max_iof_cache == pmix_list_get_size(&pmix_server_globals.iof)) {
/* we can't cache it for some reason */ /* remove the oldest cached message */
PMIX_ERROR_LOG(rc); iof = (pmix_iof_cache_t*)pmix_list_remove_first(&pmix_server_globals.iof);
PMIX_RELEASE(cd); PMIX_RELEASE(iof);
return;
} }
cached = true; /* add this output to our cache so it is cached until someone
* registers to receive it */
iof = PMIX_NEW(pmix_iof_cache_t);
memcpy(&iof->source, cd->procs, sizeof(pmix_proc_t));
iof->channel = cd->channels;
iof->bo = cd->bo;
cd->bo = NULL; // protect the data
pmix_list_append(&pmix_server_globals.iof, &iof->super);
} }
@ -2827,6 +2815,64 @@ static void notifyerror_cbfunc (pmix_status_t status, void *cbdata)
PMIX_RELEASE(cd); PMIX_RELEASE(cd);
} }
static void alloc_cbfunc(pmix_status_t status,
pmix_info_t *info, size_t ninfo,
void *cbdata,
pmix_release_cbfunc_t release_fn,
void *release_cbdata)
{
pmix_query_caddy_t *qcd = (pmix_query_caddy_t*)cbdata;
pmix_server_caddy_t *cd = (pmix_server_caddy_t*)qcd->cbdata;
pmix_buffer_t *reply;
pmix_status_t rc;
pmix_output_verbose(2, pmix_server_globals.base_output,
"pmix:alloc callback with status %d", status);
reply = PMIX_NEW(pmix_buffer_t);
if (NULL == reply) {
PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
PMIX_RELEASE(cd);
return;
}
PMIX_BFROPS_PACK(rc, cd->peer, reply, &status, 1, PMIX_STATUS);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
goto complete;
}
/* pack the returned data */
PMIX_BFROPS_PACK(rc, cd->peer, reply, &ninfo, 1, PMIX_SIZE);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
goto complete;
}
if (0 < ninfo) {
PMIX_BFROPS_PACK(rc, cd->peer, reply, info, ninfo, PMIX_INFO);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
}
}
complete:
// send reply
PMIX_SERVER_QUEUE_REPLY(rc, cd->peer, cd->hdr.tag, reply);
if (PMIX_SUCCESS != rc) {
PMIX_RELEASE(reply);
}
// cleanup
if (NULL != qcd->queries) {
PMIX_QUERY_FREE(qcd->queries, qcd->nqueries);
}
if (NULL != qcd->info) {
PMIX_INFO_FREE(qcd->info, qcd->ninfo);
}
PMIX_RELEASE(qcd);
PMIX_RELEASE(cd);
if (NULL != release_fn) {
release_fn(release_cbdata);
}
}
static void query_cbfunc(pmix_status_t status, static void query_cbfunc(pmix_status_t status,
pmix_info_t *info, size_t ninfo, pmix_info_t *info, size_t ninfo,
@ -2866,6 +2912,126 @@ static void query_cbfunc(pmix_status_t status,
} }
} }
/* cache the data for any future requests */
complete:
// send reply
PMIX_SERVER_QUEUE_REPLY(rc, cd->peer, cd->hdr.tag, reply);
if (PMIX_SUCCESS != rc) {
PMIX_RELEASE(reply);
}
// cleanup
if (NULL != qcd->queries) {
PMIX_QUERY_FREE(qcd->queries, qcd->nqueries);
}
if (NULL != qcd->info) {
PMIX_INFO_FREE(qcd->info, qcd->ninfo);
}
PMIX_RELEASE(qcd);
PMIX_RELEASE(cd);
if (NULL != release_fn) {
release_fn(release_cbdata);
}
}
static void jctrl_cbfunc(pmix_status_t status,
pmix_info_t *info, size_t ninfo,
void *cbdata,
pmix_release_cbfunc_t release_fn,
void *release_cbdata)
{
pmix_query_caddy_t *qcd = (pmix_query_caddy_t*)cbdata;
pmix_server_caddy_t *cd = (pmix_server_caddy_t*)qcd->cbdata;
pmix_buffer_t *reply;
pmix_status_t rc;
pmix_output_verbose(2, pmix_server_globals.base_output,
"pmix:jctrl callback with status %d", status);
reply = PMIX_NEW(pmix_buffer_t);
if (NULL == reply) {
PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
PMIX_RELEASE(cd);
return;
}
PMIX_BFROPS_PACK(rc, cd->peer, reply, &status, 1, PMIX_STATUS);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
goto complete;
}
/* pack the returned data */
PMIX_BFROPS_PACK(rc, cd->peer, reply, &ninfo, 1, PMIX_SIZE);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
goto complete;
}
if (0 < ninfo) {
PMIX_BFROPS_PACK(rc, cd->peer, reply, info, ninfo, PMIX_INFO);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
}
}
complete:
// send reply
PMIX_SERVER_QUEUE_REPLY(rc, cd->peer, cd->hdr.tag, reply);
if (PMIX_SUCCESS != rc) {
PMIX_RELEASE(reply);
}
// cleanup
if (NULL != qcd->queries) {
PMIX_QUERY_FREE(qcd->queries, qcd->nqueries);
}
if (NULL != qcd->info) {
PMIX_INFO_FREE(qcd->info, qcd->ninfo);
}
PMIX_RELEASE(qcd);
PMIX_RELEASE(cd);
if (NULL != release_fn) {
release_fn(release_cbdata);
}
}
static void monitor_cbfunc(pmix_status_t status,
pmix_info_t *info, size_t ninfo,
void *cbdata,
pmix_release_cbfunc_t release_fn,
void *release_cbdata)
{
pmix_query_caddy_t *qcd = (pmix_query_caddy_t*)cbdata;
pmix_server_caddy_t *cd = (pmix_server_caddy_t*)qcd->cbdata;
pmix_buffer_t *reply;
pmix_status_t rc;
pmix_output_verbose(2, pmix_server_globals.base_output,
"pmix:monitor callback with status %d", status);
reply = PMIX_NEW(pmix_buffer_t);
if (NULL == reply) {
PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
PMIX_RELEASE(cd);
return;
}
PMIX_BFROPS_PACK(rc, cd->peer, reply, &status, 1, PMIX_STATUS);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
goto complete;
}
/* pack the returned data */
PMIX_BFROPS_PACK(rc, cd->peer, reply, &ninfo, 1, PMIX_SIZE);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
goto complete;
}
if (0 < ninfo) {
PMIX_BFROPS_PACK(rc, cd->peer, reply, info, ninfo, PMIX_INFO);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
}
}
complete: complete:
// send reply // send reply
PMIX_SERVER_QUEUE_REPLY(rc, cd->peer, cd->hdr.tag, reply); PMIX_SERVER_QUEUE_REPLY(rc, cd->peer, cd->hdr.tag, reply);
@ -3314,7 +3480,7 @@ static pmix_status_t server_switchyard(pmix_peer_t *peer, uint32_t tag,
if (PMIX_ALLOC_CMD == cmd) { if (PMIX_ALLOC_CMD == cmd) {
PMIX_GDS_CADDY(cd, peer, tag); PMIX_GDS_CADDY(cd, peer, tag);
if (PMIX_SUCCESS != (rc = pmix_server_alloc(peer, buf, query_cbfunc, cd))) { if (PMIX_SUCCESS != (rc = pmix_server_alloc(peer, buf, alloc_cbfunc, cd))) {
PMIX_RELEASE(cd); PMIX_RELEASE(cd);
} }
return rc; return rc;
@ -3322,7 +3488,7 @@ static pmix_status_t server_switchyard(pmix_peer_t *peer, uint32_t tag,
if (PMIX_JOB_CONTROL_CMD == cmd) { if (PMIX_JOB_CONTROL_CMD == cmd) {
PMIX_GDS_CADDY(cd, peer, tag); PMIX_GDS_CADDY(cd, peer, tag);
if (PMIX_SUCCESS != (rc = pmix_server_job_ctrl(peer, buf, query_cbfunc, cd))) { if (PMIX_SUCCESS != (rc = pmix_server_job_ctrl(peer, buf, jctrl_cbfunc, cd))) {
PMIX_RELEASE(cd); PMIX_RELEASE(cd);
} }
return rc; return rc;
@ -3330,7 +3496,7 @@ static pmix_status_t server_switchyard(pmix_peer_t *peer, uint32_t tag,
if (PMIX_MONITOR_CMD == cmd) { if (PMIX_MONITOR_CMD == cmd) {
PMIX_GDS_CADDY(cd, peer, tag); PMIX_GDS_CADDY(cd, peer, tag);
if (PMIX_SUCCESS != (rc = pmix_server_monitor(peer, buf, query_cbfunc, cd))) { if (PMIX_SUCCESS != (rc = pmix_server_monitor(peer, buf, monitor_cbfunc, cd))) {
PMIX_RELEASE(cd); PMIX_RELEASE(cd);
} }
return rc; return rc;

389
opal/mca/pmix/pmix4x/pmix/src/server/pmix_server_ops.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2018 Research Organization for Information Science * Copyright (c) 2014-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84@gmail.com>.
@ -1121,10 +1121,9 @@ static void spcbfunc(pmix_status_t status,
{ {
pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata; pmix_setup_caddy_t *cd = (pmix_setup_caddy_t*)cbdata;
pmix_iof_req_t *req; pmix_iof_req_t *req;
pmix_setup_caddy_t *occupant;
int i;
pmix_buffer_t *msg; pmix_buffer_t *msg;
pmix_status_t rc; pmix_status_t rc;
pmix_iof_cache_t *iof, *ionext;
/* if it was successful, and there are IOF requests, then /* if it was successful, and there are IOF requests, then
* register them now */ * register them now */
@ -1142,60 +1141,60 @@ static void spcbfunc(pmix_status_t status,
req->channels = cd->channels; req->channels = cd->channels;
pmix_list_append(&pmix_globals.iof_requests, &req->super); pmix_list_append(&pmix_globals.iof_requests, &req->super);
/* process any cached IO */ /* process any cached IO */
for (i=0; i < PMIX_IOF_HOTEL_SIZE; i++) { PMIX_LIST_FOREACH_SAFE(iof, ionext, &pmix_server_globals.iof, pmix_iof_cache_t) {
pmix_hotel_knock(&pmix_server_globals.iof, PMIX_IOF_HOTEL_SIZE-i-1, (void**)&occupant); /* if the channels don't match, then ignore it */
if (NULL != occupant) { if (!(iof->channel & req->channels)) {
if (!(occupant->channels & req->channels)) { continue;
continue;
}
/* if the source matches the request, then forward this along */
if (0 != strncmp(occupant->procs->nspace, req->pname.nspace, PMIX_MAX_NSLEN) ||
(PMIX_RANK_WILDCARD != req->pname.rank && occupant->procs->rank != req->pname.rank)) {
continue;
}
/* never forward back to the source! This can happen if the source
* is a launcher */
if (0 == strncmp(occupant->procs->nspace, req->peer->info->pname.nspace, PMIX_MAX_NSLEN) &&
occupant->procs->rank == req->peer->info->pname.rank) {
continue;
}
/* setup the msg */
if (NULL == (msg = PMIX_NEW(pmix_buffer_t))) {
PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
rc = PMIX_ERR_OUT_OF_RESOURCE;
break;
}
/* provide the source */
PMIX_BFROPS_PACK(rc, req->peer, msg, occupant->procs, 1, PMIX_PROC);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* provide the channel */
PMIX_BFROPS_PACK(rc, req->peer, msg, &occupant->channels, 1, PMIX_IOF_CHANNEL);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* pack the data */
PMIX_BFROPS_PACK(rc, req->peer, msg, occupant->bo, 1, PMIX_BYTE_OBJECT);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* send it to the requestor */
PMIX_PTL_SEND_ONEWAY(rc, req->peer, msg, PMIX_PTL_TAG_IOF);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
}
/* remove it from the hotel since it has now been forwarded */
pmix_hotel_checkout(&pmix_server_globals.iof, PMIX_IOF_HOTEL_SIZE-i-1);
PMIX_RELEASE(occupant);
} }
/* if the source does not match the request, then ignore it */
if (!PMIX_CHECK_PROCID(&iof->source, &req->pname)) {
continue;
}
/* never forward back to the source! This can happen if the source
* is a launcher */
if (PMIX_CHECK_PROCID(&iof->source, &req->peer->info->pname)) {
continue;
}
pmix_output_verbose(2, pmix_server_globals.iof_output,
"PMIX:SERVER:SPAWN delivering cached IOF from %s:%d to %s:%d",
iof->source.nspace, iof->source.rank,
req->pname.nspace, req->pname.rank);
/* setup the msg */
if (NULL == (msg = PMIX_NEW(pmix_buffer_t))) {
PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
rc = PMIX_ERR_OUT_OF_RESOURCE;
break;
}
/* provide the source */
PMIX_BFROPS_PACK(rc, req->peer, msg, &iof->source, 1, PMIX_PROC);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* provide the channel */
PMIX_BFROPS_PACK(rc, req->peer, msg, &iof->channel, 1, PMIX_IOF_CHANNEL);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* pack the data */
PMIX_BFROPS_PACK(rc, req->peer, msg, iof->bo, 1, PMIX_BYTE_OBJECT);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* send it to the requestor */
PMIX_PTL_SEND_ONEWAY(rc, req->peer, msg, PMIX_PTL_TAG_IOF);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
}
/* remove it from the list since it has now been forwarded */
pmix_list_remove_item(&pmix_server_globals.iof, &iof->super);
PMIX_RELEASE(iof);
} }
} }
@ -1294,7 +1293,8 @@ pmix_status_t pmix_server_spawn(pmix_peer_t *peer,
} }
} }
} }
/* we will construct any required iof request tracker upon completion of the spawn */ /* we will construct any required iof request tracker upon completion of the spawn
* as we need the nspace of the spawned application! */
} }
/* add the directive to the end */ /* add the directive to the end */
if (PMIX_PROC_IS_TOOL(peer)) { if (PMIX_PROC_IS_TOOL(peer)) {
@ -1648,6 +1648,8 @@ pmix_status_t pmix_server_register_events(pmix_peer_t *peer,
pmix_cmd_t cmd = PMIX_NOTIFY_CMD; pmix_cmd_t cmd = PMIX_NOTIFY_CMD;
pmix_proc_t *affected = NULL; pmix_proc_t *affected = NULL;
size_t naffected = 0; size_t naffected = 0;
pmix_range_trkr_t rngtrk;
pmix_proc_t proc;
pmix_output_verbose(2, pmix_server_globals.event_output, pmix_output_verbose(2, pmix_server_globals.event_output,
"recvd register events for peer %s:%d", "recvd register events for peer %s:%d",
@ -1882,6 +1884,8 @@ pmix_status_t pmix_server_register_events(pmix_peer_t *peer,
} }
/* check if any matching notifications have been cached */ /* check if any matching notifications have been cached */
rngtrk.procs = NULL;
rngtrk.nprocs = 0;
for (i=0; i < pmix_globals.max_events; i++) { for (i=0; i < pmix_globals.max_events; i++) {
pmix_hotel_knock(&pmix_globals.notifications, i, (void**)&cd); pmix_hotel_knock(&pmix_globals.notifications, i, (void**)&cd);
if (NULL == cd) { if (NULL == cd) {
@ -1904,23 +1908,33 @@ pmix_status_t pmix_server_register_events(pmix_peer_t *peer,
if (!found) { if (!found) {
continue; continue;
} }
/* if we were given specific targets, check if this is one */ /* check the range */
rngtrk.range = cd->range;
PMIX_LOAD_PROCID(&proc, peer->info->pname.nspace, peer->info->pname.rank);
if (!pmix_notify_check_range(&rngtrk, &proc)) {
continue;
}
/* if we were given specific targets, check if this is one */
found = false;
if (NULL != cd->targets) { if (NULL != cd->targets) {
matched = false; matched = false;
for (n=0; n < cd->ntargets; n++) { for (n=0; n < cd->ntargets; n++) {
if (0 != strncmp(peer->info->pname.nspace, cd->targets[n].nspace, PMIX_MAX_NSLEN)) {
continue;
}
/* if the source of the event is the same peer just registered, then ignore it /* if the source of the event is the same peer just registered, then ignore it
* as the event notification system will have already locally * as the event notification system will have already locally
* processed it */ * processed it */
if (0 == strncmp(peer->info->pname.nspace, cd->source.nspace, PMIX_MAX_NSLEN) && if (PMIX_CHECK_PROCID(&cd->source, &peer->info->pname)) {
peer->info->pname.rank == cd->source.rank) {
continue; continue;
} }
if (PMIX_RANK_WILDCARD == cd->targets[n].rank || if (PMIX_CHECK_PROCID(&peer->info->pname, &cd->targets[n])) {
peer->info->pname.rank == cd->targets[n].rank) {
matched = true; matched = true;
/* track the number of targets we have left to notify */
--cd->nleft;
/* if this is the last one, then evict this event
* from the cache */
if (0 == cd->nleft) {
pmix_hotel_checkout(&pmix_globals.notifications, cd->room);
found = true; // mark that we should release cd
}
break; break;
} }
} }
@ -1929,6 +1943,7 @@ pmix_status_t pmix_server_register_events(pmix_peer_t *peer,
continue; continue;
} }
} }
/* if they specified affected proc(s) they wanted to know about, check */ /* if they specified affected proc(s) they wanted to know about, check */
if (!pmix_notify_check_affected(cd->affected, cd->naffected, if (!pmix_notify_check_affected(cd->affected, cd->naffected,
affected, naffected)) { affected, naffected)) {
@ -1974,7 +1989,11 @@ pmix_status_t pmix_server_register_events(pmix_peer_t *peer,
if (PMIX_SUCCESS != ret) { if (PMIX_SUCCESS != ret) {
PMIX_RELEASE(relay); PMIX_RELEASE(relay);
} }
if (found) {
PMIX_RELEASE(cd);
}
} }
if (NULL != codes) { if (NULL != codes) {
free(codes); free(codes);
} }
@ -2196,14 +2215,14 @@ pmix_status_t pmix_server_query(pmix_peer_t *peer,
pmix_status_t rc; pmix_status_t rc;
pmix_query_caddy_t *cd; pmix_query_caddy_t *cd;
pmix_proc_t proc; pmix_proc_t proc;
pmix_cb_t cb;
size_t n, p;
pmix_list_t results;
pmix_kval_t *kv, *kvnxt;
pmix_output_verbose(2, pmix_server_globals.base_output, pmix_output_verbose(2, pmix_server_globals.base_output,
"recvd query from client"); "recvd query from client");
if (NULL == pmix_host_server.query) {
return PMIX_ERR_NOT_SUPPORTED;
}
cd = PMIX_NEW(pmix_query_caddy_t); cd = PMIX_NEW(pmix_query_caddy_t);
if (NULL == cd) { if (NULL == cd) {
return PMIX_ERR_NOMEM; return PMIX_ERR_NOMEM;
@ -2214,36 +2233,132 @@ pmix_status_t pmix_server_query(pmix_peer_t *peer,
PMIX_BFROPS_UNPACK(rc, peer, buf, &cd->nqueries, &cnt, PMIX_SIZE); PMIX_BFROPS_UNPACK(rc, peer, buf, &cd->nqueries, &cnt, PMIX_SIZE);
if (PMIX_SUCCESS != rc) { if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc); PMIX_ERROR_LOG(rc);
goto exit; PMIX_RELEASE(cd);
return rc;
} }
/* unpack the queries */ /* unpack the queries */
if (0 < cd->nqueries) { if (0 < cd->nqueries) {
PMIX_QUERY_CREATE(cd->queries, cd->nqueries); PMIX_QUERY_CREATE(cd->queries, cd->nqueries);
if (NULL == cd->queries) { if (NULL == cd->queries) {
rc = PMIX_ERR_NOMEM; rc = PMIX_ERR_NOMEM;
goto exit; PMIX_RELEASE(cd);
return rc;
} }
cnt = cd->nqueries; cnt = cd->nqueries;
PMIX_BFROPS_UNPACK(rc, peer, buf, cd->queries, &cnt, PMIX_QUERY); PMIX_BFROPS_UNPACK(rc, peer, buf, cd->queries, &cnt, PMIX_QUERY);
if (PMIX_SUCCESS != rc) { if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc); PMIX_ERROR_LOG(rc);
goto exit; PMIX_RELEASE(cd);
return rc;
} }
} }
/** check each query/key to see if we already have the info
* before passing the request up to the host */
/* check the directives to see if they want us to refresh
* the local cached results - if we wanted to optimize this
* more, we would check each query and allow those that don't
* want to be refreshed to be executed locally, and those that
* did would be sent to the host. However, for now we simply
* */
memset(proc.nspace, 0, PMIX_MAX_NSLEN+1);
proc.rank = PMIX_RANK_INVALID;
PMIX_CONSTRUCT(&results, pmix_list_t);
for (n=0; n < cd->nqueries; n++) {
for (p=0; p < cd->queries[n].nqual; p++) {
if (PMIX_CHECK_KEY(&cd->queries[n].qualifiers[p], PMIX_QUERY_REFRESH_CACHE)) {
if (PMIX_INFO_TRUE(&cd->queries[n].qualifiers[p])) {
PMIX_LIST_DESTRUCT(&results);
goto query;
}
} else if (PMIX_CHECK_KEY(&cd->queries[n].qualifiers[p], PMIX_PROCID)) {
PMIX_LOAD_NSPACE(proc.nspace, cd->queries[n].qualifiers[p].value.data.proc->nspace);
proc.rank = cd->queries[n].qualifiers[p].value.data.proc->rank;
} else if (PMIX_CHECK_KEY(&cd->queries[n].qualifiers[p], PMIX_NSPACE)) {
PMIX_LOAD_NSPACE(proc.nspace, cd->queries[n].qualifiers[p].value.data.string);
} else if (PMIX_CHECK_KEY(&cd->queries[n].qualifiers[p], PMIX_RANK)) {
proc.rank = cd->queries[n].qualifiers[p].value.data.rank;
}
}
/* we get here if a refresh isn't required - first try a local
* "get" on the data to see if we already have it */
PMIX_CONSTRUCT(&cb, pmix_cb_t);
cb.copy = false;
/* set the proc */
if (PMIX_RANK_INVALID == proc.rank &&
0 == strlen(proc.nspace)) {
/* use our id */
cb.proc = &pmix_globals.myid;
} else {
if (0 == strlen(proc.nspace)) {
/* use our nspace */
PMIX_LOAD_NSPACE(cb.proc->nspace, pmix_globals.myid.nspace);
}
if (PMIX_RANK_INVALID == proc.rank) {
/* user the wildcard rank */
proc.rank = PMIX_RANK_WILDCARD;
}
cb.proc = &proc;
}
for (p=0; NULL != cd->queries[n].keys[p]; p++) {
cb.key = cd->queries[n].keys[p];
PMIX_GDS_FETCH_KV(rc, pmix_globals.mypeer, &cb);
if (PMIX_SUCCESS != rc) {
/* needs to be passed to the host */
PMIX_LIST_DESTRUCT(&results);
PMIX_DESTRUCT(&cb);
goto query;
}
/* need to retain this result */
PMIX_LIST_FOREACH_SAFE(kv, kvnxt, &cb.kvs, pmix_kval_t) {
pmix_list_remove_item(&cb.kvs, &kv->super);
pmix_list_append(&results, &kv->super);
}
PMIX_DESTRUCT(&cb);
}
}
/* if we get here, then all queries were completely locally
* resolved, so construct the results for return */
rc = PMIX_ERR_NOT_FOUND;
if (0 < (cd->ninfo = pmix_list_get_size(&results))) {
PMIX_INFO_CREATE(cd->info, cd->ninfo);
n = 0;
PMIX_LIST_FOREACH_SAFE(kv, kvnxt, &results, pmix_kval_t) {
PMIX_LOAD_KEY(cd->info[n].key, kv->key);
rc = pmix_value_xfer(&cd->info[n].value, kv->value);
if (PMIX_SUCCESS != rc) {
PMIX_INFO_FREE(cd->info, cd->ninfo);
cd->info = NULL;
cd->ninfo = 0;
break;
}
++n;
}
}
/* done with the list of results */
PMIX_LIST_DESTRUCT(&results);
/* we can just call the cbfunc here as we are already
* in an event - let our internal cbfunc do a threadshift
* if necessary */
cbfunc(PMIX_SUCCESS, cd->info, cd->ninfo, cd, NULL, NULL);
return PMIX_SUCCESS;
query:
if (NULL == pmix_host_server.query) {
PMIX_RELEASE(cd);
return PMIX_ERR_NOT_SUPPORTED;
}
/* setup the requesting peer name */ /* setup the requesting peer name */
pmix_strncpy(proc.nspace, peer->info->pname.nspace, PMIX_MAX_NSLEN); PMIX_LOAD_PROCID(&proc, peer->info->pname.nspace, peer->info->pname.rank);
proc.rank = peer->info->pname.rank;
/* ask the host for the info */ /* ask the host for the info */
if (PMIX_SUCCESS != (rc = pmix_host_server.query(&proc, cd->queries, cd->nqueries, if (PMIX_SUCCESS != (rc = pmix_host_server.query(&proc, cd->queries, cd->nqueries,
cbfunc, cd))) { cbfunc, cd))) {
goto exit; PMIX_RELEASE(cd);
} }
return PMIX_SUCCESS;
exit:
PMIX_RELEASE(cd);
return rc; return rc;
} }
@ -2952,9 +3067,8 @@ pmix_status_t pmix_server_iofreg(pmix_peer_t *peer,
pmix_iof_req_t *req; pmix_iof_req_t *req;
bool notify, match; bool notify, match;
size_t n; size_t n;
int i;
pmix_setup_caddy_t *occupant;
pmix_buffer_t *msg; pmix_buffer_t *msg;
pmix_iof_cache_t *iof, *ionext;
pmix_output_verbose(2, pmix_server_globals.iof_output, pmix_output_verbose(2, pmix_server_globals.iof_output,
"recvd IOF PULL request from client"); "recvd IOF PULL request from client");
@ -3051,54 +3165,60 @@ pmix_status_t pmix_server_iofreg(pmix_peer_t *peer,
pmix_list_append(&pmix_globals.iof_requests, &req->super); pmix_list_append(&pmix_globals.iof_requests, &req->super);
} }
/* process any cached IO */ /* process any cached IO */
for (i=0; i < PMIX_IOF_HOTEL_SIZE; i++) { PMIX_LIST_FOREACH_SAFE(iof, ionext, &pmix_server_globals.iof, pmix_iof_cache_t) {
pmix_hotel_knock(&pmix_server_globals.iof, PMIX_IOF_HOTEL_SIZE-i-1, (void**)&occupant); /* if the channels don't match, then ignore it */
if (NULL != occupant) { if (!(iof->channel & req->channels)) {
if (!(occupant->channels & req->channels)) { continue;
continue;
}
/* if the source matches the request, then forward this along */
if (0 != strncmp(occupant->procs->nspace, req->pname.nspace, PMIX_MAX_NSLEN) ||
(PMIX_RANK_WILDCARD != req->pname.rank && occupant->procs->rank != req->pname.rank)) {
continue;
}
/* setup the msg */
if (NULL == (msg = PMIX_NEW(pmix_buffer_t))) {
PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
rc = PMIX_ERR_OUT_OF_RESOURCE;
break;
}
/* provide the source */
PMIX_BFROPS_PACK(rc, req->peer, msg, occupant->procs, 1, PMIX_PROC);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* provide the channel */
PMIX_BFROPS_PACK(rc, req->peer, msg, &occupant->channels, 1, PMIX_IOF_CHANNEL);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* pack the data */
PMIX_BFROPS_PACK(rc, req->peer, msg, occupant->bo, 1, PMIX_BYTE_OBJECT);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* send it to the requestor */
PMIX_PTL_SEND_ONEWAY(rc, req->peer, msg, PMIX_PTL_TAG_IOF);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
}
/* remove it from the hotel since it has now been forwarded */
pmix_hotel_checkout(&pmix_server_globals.iof, PMIX_IOF_HOTEL_SIZE-i-1);
PMIX_RELEASE(occupant);
} }
/* if the source does not match the request, then ignore it */
if (!PMIX_CHECK_PROCID(&iof->source, &req->pname)) {
continue;
}
/* never forward back to the source! This can happen if the source
* is a launcher */
if (PMIX_CHECK_PROCID(&iof->source, &req->peer->info->pname)) {
continue;
}
pmix_output_verbose(2, pmix_server_globals.iof_output,
"PMIX:SERVER:IOFREQ delivering cached IOF from %s:%d to %s:%d",
iof->source.nspace, iof->source.rank,
req->peer->info->pname.nspace, req->peer->info->pname.rank);
/* setup the msg */
if (NULL == (msg = PMIX_NEW(pmix_buffer_t))) {
PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
rc = PMIX_ERR_OUT_OF_RESOURCE;
break;
}
/* provide the source */
PMIX_BFROPS_PACK(rc, req->peer, msg, &iof->source, 1, PMIX_PROC);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* provide the channel */
PMIX_BFROPS_PACK(rc, req->peer, msg, &iof->channel, 1, PMIX_IOF_CHANNEL);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* pack the data */
PMIX_BFROPS_PACK(rc, req->peer, msg, iof->bo, 1, PMIX_BYTE_OBJECT);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
break;
}
/* send it to the requestor */
PMIX_PTL_SEND_ONEWAY(rc, req->peer, msg, PMIX_PTL_TAG_IOF);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
PMIX_RELEASE(msg);
}
/* remove it from the list since it has now been forwarded */
pmix_list_remove_item(&pmix_server_globals.iof, &iof->super);
PMIX_RELEASE(iof);
} }
} }
if (notify) { if (notify) {
@ -4043,6 +4163,7 @@ static void ncon(pmix_notify_caddy_t *p)
p->range = PMIX_RANGE_UNDEF; p->range = PMIX_RANGE_UNDEF;
p->targets = NULL; p->targets = NULL;
p->ntargets = 0; p->ntargets = 0;
p->nleft = SIZE_MAX;
p->affected = NULL; p->affected = NULL;
p->naffected = 0; p->naffected = 0;
p->nondefault = false; p->nondefault = false;
@ -4192,3 +4313,15 @@ PMIX_CLASS_INSTANCE(pmix_group_t,
PMIX_CLASS_INSTANCE(pmix_group_caddy_t, PMIX_CLASS_INSTANCE(pmix_group_caddy_t,
pmix_list_item_t, pmix_list_item_t,
NULL, NULL); NULL, NULL);
static void iocon(pmix_iof_cache_t *p)
{
p->bo = NULL;
}
static void iodes(pmix_iof_cache_t *p)
{
PMIX_BYTE_OBJECT_FREE(p->bo, 1); // macro protects against NULL
}
PMIX_CLASS_INSTANCE(pmix_iof_cache_t,
pmix_list_item_t,
iocon, iodes);

23
opal/mca/pmix/pmix4x/pmix/src/server/pmix_server_ops.h
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2015-2018 Intel, Inc. All rights reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2015 Artem Y. Polyakov <artpol84@gmail.com>.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Mellanox Technologies, Inc. * Copyright (c) 2015 Mellanox Technologies, Inc.
@ -14,6 +14,11 @@
#ifndef PMIX_SERVER_OPS_H #ifndef PMIX_SERVER_OPS_H
#define PMIX_SERVER_OPS_H #define PMIX_SERVER_OPS_H
#include <unistd.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <src/include/pmix_config.h> #include <src/include/pmix_config.h>
#include "src/include/types.h" #include "src/include/types.h"
#include <pmix_common.h> #include <pmix_common.h>
@ -58,6 +63,11 @@ typedef struct {
pmix_iof_channel_t channels; pmix_iof_channel_t channels;
pmix_byte_object_t *bo; pmix_byte_object_t *bo;
size_t nbo; size_t nbo;
/* timestamp receipt of the notification so we
* can evict the oldest one if we get overwhelmed */
time_t ts;
/* what room of the hotel they are in */
int room;
pmix_op_cbfunc_t opcbfunc; pmix_op_cbfunc_t opcbfunc;
pmix_dmodex_response_fn_t cbfunc; pmix_dmodex_response_fn_t cbfunc;
pmix_setup_application_cbfunc_t setupcbfunc; pmix_setup_application_cbfunc_t setupcbfunc;
@ -147,6 +157,14 @@ typedef struct {
} pmix_group_caddy_t; } pmix_group_caddy_t;
PMIX_CLASS_DECLARATION(pmix_group_caddy_t); PMIX_CLASS_DECLARATION(pmix_group_caddy_t);
typedef struct {
pmix_list_item_t super;
pmix_proc_t source;
pmix_iof_channel_t channel;
pmix_byte_object_t *bo;
} pmix_iof_cache_t;
PMIX_CLASS_DECLARATION(pmix_iof_cache_t);
typedef struct { typedef struct {
pmix_list_t nspaces; // list of pmix_nspace_t for the nspaces we know about pmix_list_t nspaces; // list of pmix_nspace_t for the nspaces we know about
pmix_pointer_array_t clients; // array of pmix_peer_t local clients pmix_pointer_array_t clients; // array of pmix_peer_t local clients
@ -156,7 +174,8 @@ typedef struct {
pmix_list_t gdata; // cache of data given to me for passing to all clients pmix_list_t gdata; // cache of data given to me for passing to all clients
pmix_list_t events; // list of pmix_regevents_info_t registered events pmix_list_t events; // list of pmix_regevents_info_t registered events
pmix_list_t groups; // list of pmix_group_t group memberships pmix_list_t groups; // list of pmix_group_t group memberships
pmix_hotel_t iof; // IO to be forwarded to clients pmix_list_t iof; // IO to be forwarded to clients
size_t max_iof_cache; // max number of IOF messages to cache
bool tool_connections_allowed; bool tool_connections_allowed;
char *tmpdir; // temporary directory for this server char *tmpdir; // temporary directory for this server
char *system_tmpdir; // system tmpdir char *system_tmpdir; // system tmpdir

12
opal/mca/pmix/pmix4x/pmix/src/tool/pmix_tool.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science * Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2014 Artem Y. Polyakov <artpol84@gmail.com>.
@ -1098,7 +1098,6 @@ PMIX_EXPORT pmix_status_t PMIx_tool_finalize(void)
struct timeval tv = {5, 0}; struct timeval tv = {5, 0};
int n; int n;
pmix_peer_t *peer; pmix_peer_t *peer;
pmix_setup_caddy_t *cd;
PMIX_ACQUIRE_THREAD(&pmix_global_lock); PMIX_ACQUIRE_THREAD(&pmix_global_lock);
if (1 != pmix_globals.init_cntr) { if (1 != pmix_globals.init_cntr) {
@ -1183,14 +1182,6 @@ PMIX_EXPORT pmix_status_t PMIx_tool_finalize(void)
if (PMIX_PROC_IS_LAUNCHER(pmix_globals.mypeer)) { if (PMIX_PROC_IS_LAUNCHER(pmix_globals.mypeer)) {
pmix_ptl_base_stop_listening(); pmix_ptl_base_stop_listening();
/* cleanout any IOF */
for (n=0; n < PMIX_IOF_HOTEL_SIZE; n++) {
pmix_hotel_checkout_and_return_occupant(&pmix_server_globals.iof, n, (void**)&cd);
if (NULL != cd) {
PMIX_RELEASE(cd);
}
}
PMIX_DESTRUCT(&pmix_server_globals.iof);
for (n=0; n < pmix_server_globals.clients.size; n++) { for (n=0; n < pmix_server_globals.clients.size; n++) {
if (NULL != (peer = (pmix_peer_t*)pmix_pointer_array_get_item(&pmix_server_globals.clients, n))) { if (NULL != (peer = (pmix_peer_t*)pmix_pointer_array_get_item(&pmix_server_globals.clients, n))) {
PMIX_RELEASE(peer); PMIX_RELEASE(peer);
@ -1204,6 +1195,7 @@ PMIX_EXPORT pmix_status_t PMIx_tool_finalize(void)
PMIX_LIST_DESTRUCT(&pmix_server_globals.gdata); PMIX_LIST_DESTRUCT(&pmix_server_globals.gdata);
PMIX_LIST_DESTRUCT(&pmix_server_globals.events); PMIX_LIST_DESTRUCT(&pmix_server_globals.events);
PMIX_LIST_DESTRUCT(&pmix_server_globals.nspaces); PMIX_LIST_DESTRUCT(&pmix_server_globals.nspaces);
PMIX_LIST_DESTRUCT(&pmix_server_globals.iof);
} }
/* shutdown services */ /* shutdown services */

16
opal/mca/pmix/pmix4x/pmix/test/simple/simptest.c
Просмотреть файл

@ -13,7 +13,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved.
@ -926,6 +926,7 @@ static void lkcbfn(int sd, short args, void *cbdata)
lk->cbfunc(PMIX_SUCCESS, lk->pd, lk->n, lk->cbdata); lk->cbfunc(PMIX_SUCCESS, lk->pd, lk->n, lk->cbdata);
PMIX_PDATA_FREE(lk->pd, lk->n); PMIX_PDATA_FREE(lk->pd, lk->n);
free(lk);
} }
static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys, static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
@ -937,7 +938,7 @@ static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
size_t i, n; size_t i, n;
pmix_pdata_t *pd = NULL; pmix_pdata_t *pd = NULL;
pmix_status_t ret = PMIX_ERR_NOT_FOUND; pmix_status_t ret = PMIX_ERR_NOT_FOUND;
lkobj_t lk; lkobj_t *lk;
pmix_output(0, "SERVER: LOOKUP"); pmix_output(0, "SERVER: LOOKUP");
@ -971,11 +972,12 @@ static pmix_status_t lookup_fn(const pmix_proc_t *proc, char **keys,
} }
PMIX_LIST_DESTRUCT(&results); PMIX_LIST_DESTRUCT(&results);
if (PMIX_SUCCESS == ret) { if (PMIX_SUCCESS == ret) {
lk.pd = pd; lk = (lkobj_t*)malloc(sizeof(lkobj_t));
lk.n = n; lk->pd = pd;
lk.cbfunc = cbfunc; lk->n = n;
lk.cbdata = cbdata; lk->cbfunc = cbfunc;
PMIX_THREADSHIFT(&lk, lkcbfn); lk->cbdata = cbdata;
PMIX_THREADSHIFT(lk, lkcbfn);
} }
return ret; return ret;