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

pmix2x: Update to latest PMIx master

Просмотр исходного кода 
pmix/master@6ed27be839

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Этот коммит содержится в:
Gilles Gouaillardet 2017-02-08 13:23:27 +09:00
родитель 4b2eba34a6
Коммит 7acef4833e
149 изменённых файлов: 346 добавлений и 295 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
opal/mca/pmix/pmix2x/pmix/INSTALL
Просмотреть файл

@ -9,7 +9,7 @@ Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
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) 2008-2015 Cisco Systems, Inc. All rights reserved. Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
Copyright (c) 2013-2017 Intel, Inc. All rights reserved. Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
$COPYRIGHT$ $COPYRIGHT$
Additional copyrights may follow Additional copyrights may follow
@ -85,3 +85,4 @@ shell$ make install
Parallel make is generally only helpful in the build phase; the Parallel make is generally only helpful in the build phase; the
installation process is mostly serial and does not benefit much from installation process is mostly serial and does not benefit much from
parallel make. parallel make.

2
opal/mca/pmix/pmix2x/pmix/LICENSE
Просмотреть файл

@ -45,7 +45,7 @@ Copyright (c) 2010 ARM ltd. All rights reserved.
Copyright (c) 2010-2011 Alex Brick <bricka@ccs.neu.edu>. All rights reserved. Copyright (c) 2010-2011 Alex Brick <bricka@ccs.neu.edu>. All rights reserved.
Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights
reserved. reserved.
Copyright (c) 2013-2017 Intel, Inc. All rights reserved. Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved. Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved.
$COPYRIGHT$ $COPYRIGHT$

3
opal/mca/pmix/pmix2x/pmix/Makefile.am
Просмотреть файл

@ -11,7 +11,7 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2006-2016 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-2017 Intel, Inc. All rights reserved. # Copyright (c) 2013-2016 Intel, Inc. All rights reserved
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -61,3 +61,4 @@ nroff:
dist-hook: dist-hook:
env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)" env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)"

2
opal/mca/pmix/pmix2x/pmix/README
Просмотреть файл

@ -15,7 +15,7 @@ Copyright (c) 2007 Myricom, Inc. All rights reserved.
Copyright (c) 2008 IBM Corporation. All rights reserved. Copyright (c) 2008 IBM Corporation. All rights reserved.
Copyright (c) 2010 Oak Ridge National Labs. All rights reserved. Copyright (c) 2010 Oak Ridge National Labs. All rights reserved.
Copyright (c) 2011 University of Houston. All rights reserved. Copyright (c) 2011 University of Houston. All rights reserved.
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. Copyright (c) 2013-2015 Intel, Inc. All rights reserved
$COPYRIGHT$ $COPYRIGHT$
Additional copyrights may follow Additional copyrights may follow

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

@ -30,7 +30,7 @@ greek=a1
# 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=git972f79a repo_rev=git6ed27be
# 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="Jan 31, 2017" date="Feb 08, 2017"
# 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

2
opal/mca/pmix/pmix2x/pmix/config/Makefile.am
Просмотреть файл

@ -1,4 +1,4 @@
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. # Copyright (c) 2013-2016 Intel, 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.
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.

2
opal/mca/pmix/pmix2x/pmix/config/c_get_alignment.m4
Просмотреть файл

@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$

1
opal/mca/pmix/pmix2x/pmix/config/distscript.sh
Просмотреть файл

@ -15,7 +15,6 @@
# and Technology (RIST). All rights reserved. # and Technology (RIST). 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) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_attributes.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*- # -*- shell-script -*-
# PMIx copyrights: # PMIx copyrights:
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. # Copyright (c) 2013 Intel, Inc. All rights reserved
# #
######################### #########################
# #

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_broken_qsort.m4
Просмотреть файл

@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4
Просмотреть файл

@ -1,7 +1,7 @@
dnl -*- shell-script -*- dnl -*- shell-script -*-
dnl dnl
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2013 Intel, Inc. All rights reserved
dnl dnl
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_icc.m4
Просмотреть файл

@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
dnl University of Stuttgart. All rights reserved. dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2016 Research Organization for Information Science dnl Copyright (c) 2016 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_ident.m4
Просмотреть файл

@ -1,7 +1,7 @@
dnl -*- shell-script -*- dnl -*- shell-script -*-
dnl dnl
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2015-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2015 Intel, Inc. All rights reserved
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow

4
opal/mca/pmix/pmix2x/pmix/config/pmix_check_lock.m4
Просмотреть файл

@ -2,7 +2,7 @@ dnl -*- shell-script -*-
dnl dnl
dnl Copyright (c) 2017 Mellanox Technologies, Inc. dnl Copyright (c) 2017 Mellanox Technologies, Inc.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2017 IBM Corporation. All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow
@ -24,7 +24,7 @@ AC_DEFUN([PMIX_CHECK_DSTOR_LOCK],[
_x_ac_fcntl_lock_found="1" _x_ac_fcntl_lock_found="1"
], [], [#include <fcntl.h>]) ], [], [#include <fcntl.h>])
if test "$ESH_PTHREAD_LOCK" == "1"; then if test "$DSTORE_PTHREAD_LOCK" == "1"; then
AC_CHECK_FUNC([pthread_rwlockattr_setkind_np], AC_CHECK_FUNC([pthread_rwlockattr_setkind_np],
[AC_EGREP_HEADER([PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP], [AC_EGREP_HEADER([PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP],
[pthread.h],[ [pthread.h],[

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4
Просмотреть файл

@ -12,7 +12,7 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2012-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2012-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. # Copyright (c) 2014 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4
Просмотреть файл

@ -12,7 +12,7 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2006 QLogic Corp. All rights reserved. # Copyright (c) 2006 QLogic Corp. All rights reserved.
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. # Copyright (c) 2016 Intel Corporation. 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 Los Alamos National Security, LLC. All rights # Copyright (c) 2016 Los Alamos National Security, LLC. All rights

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_vendor.m4
Просмотреть файл

@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. dnl Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2013 Intel, Inc. All rights reserved
dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.

1
opal/mca/pmix/pmix2x/pmix/config/pmix_check_visibility.m4
Просмотреть файл

@ -12,7 +12,6 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2009-2011 Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2009-2011 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/config/pmix_check_withdir.m4
Просмотреть файл

@ -8,7 +8,7 @@ dnl reserved.
dnl Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl Copyright (c) 2016-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2016 Intel, Inc. All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/config/pmix_config_subdir.m4
Просмотреть файл

@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2012-2016 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2012-2016 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$

2
opal/mca/pmix/pmix2x/pmix/config/pmix_ensure_contains_optflags.m4
Просмотреть файл

@ -12,7 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2013 Intel, Inc. All rights reserved
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/config/pmix_get_version.sh
Просмотреть файл

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. # Copyright (c) 2015 Intel, Inc. All rights reserved
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/config/pmix_load_platform.m4
Просмотреть файл

@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
dnl University of Stuttgart. All rights reserved. dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$

1
opal/mca/pmix/pmix2x/pmix/config/pmix_mca_priority_sort.pl
Просмотреть файл

@ -2,7 +2,6 @@
# #
# Copyright (c) 2010 Sandia National Laboratories. All rights reserved. # Copyright (c) 2010 Sandia National Laboratories. All rights reserved.
# #
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/config/pmix_search_libs.m4
Просмотреть файл

@ -1,7 +1,7 @@
dnl -*- shell-script -*- dnl -*- shell-script -*-
dnl dnl
dnl Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow

24
opal/mca/pmix/pmix2x/pmix/contrib/buildrpm.sh
Просмотреть файл

@ -96,19 +96,19 @@ echo "--> Found specfile: $specfile"
rpmtopdir=${rpmtopdir:-"`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"} rpmtopdir=${rpmtopdir:-"`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"}
if test "$rpmtopdir" != ""; then if test "$rpmtopdir" != ""; then
rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'" rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'"
if test ! -d "$rpmtopdir"; then if test ! -d "$rpmtopdir"; then
mkdir -p "$rpmtopdir" mkdir -p "$rpmtopdir"
mkdir -p "$rpmtopdir/BUILD" mkdir -p "$rpmtopdir/BUILD"
mkdir -p "$rpmtopdir/RPMS" mkdir -p "$rpmtopdir/RPMS"
mkdir -p "$rpmtopdir/RPMS/i386" mkdir -p "$rpmtopdir/RPMS/i386"
mkdir -p "$rpmtopdir/RPMS/i586" mkdir -p "$rpmtopdir/RPMS/i586"
mkdir -p "$rpmtopdir/RPMS/i686" mkdir -p "$rpmtopdir/RPMS/i686"
mkdir -p "$rpmtopdir/RPMS/noarch" mkdir -p "$rpmtopdir/RPMS/noarch"
mkdir -p "$rpmtopdir/RPMS/athlon" mkdir -p "$rpmtopdir/RPMS/athlon"
mkdir -p "$rpmtopdir/SOURCES" mkdir -p "$rpmtopdir/SOURCES"
mkdir -p "$rpmtopdir/SPECS" mkdir -p "$rpmtopdir/SPECS"
mkdir -p "$rpmtopdir/SRPMS" mkdir -p "$rpmtopdir/SRPMS"
fi fi
need_root=0 need_root=0
elif test -d /usr/src/RPM; then elif test -d /usr/src/RPM; then

2
opal/mca/pmix/pmix2x/pmix/contrib/make_dist_tarball
Просмотреть файл

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. # Copyright (c) 2015 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi.h
Просмотреть файл

@ -1,7 +1,6 @@
/* /*
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi2.c
Просмотреть файл

@ -1,7 +1,6 @@
/* /*
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

10
opal/mca/pmix/pmix2x/pmix/contrib/pmix-release.sh
Просмотреть файл

@ -36,16 +36,16 @@ for branch in $branches; do
module load libevent/pmix-$branch module load libevent/pmix-$branch
./$script $@ >dist.out 2>&1 ./$script $@ >dist.out 2>&1
if test "$?" != "0"; then if test "$?" != "0"; then
cat <<EOF cat <<EOF
============================================================================= =============================================================================
== Dist failure == Dist failure
== Last few lines of output (full results in dist.out file): == Last few lines of output (full results in dist.out file):
============================================================================= =============================================================================
EOF EOF
tail -n 20 dist.out tail -n 20 dist.out
exit 1 exit 1
fi fi
module unload libevent module unload libevent
module unload autotools module unload autotools

4
opal/mca/pmix/pmix2x/pmix/contrib/pmix-valgrind.supp
Просмотреть файл

@ -1,6 +1,6 @@
# -*- text -*- # -*- text -*-
# #
# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. # Copyright (c) 2015 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -44,3 +44,5 @@
fun:PMIx_init fun:PMIx_init
fun:main fun:main
} }

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

@ -12,7 +12,7 @@
# Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2006-2014 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-2017 Intel, Inc. All rights reserved. # Copyright (c) 2015 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -473,8 +473,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%if %{use_mpi_selector} %if %{use_mpi_selector}
%post %post
%{mpi_selector} \ %{mpi_selector} \
--register %{name}-%{version} \ --register %{name}-%{version} \
--source-dir %{shell_scripts_path} \ --source-dir %{shell_scripts_path} \
--yes --yes
%endif %endif
@ -683,3 +683,4 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
* Wed Mar 23 2005 Mezzanine <mezzanine@kainx.org> * Wed Mar 23 2005 Mezzanine <mezzanine@kainx.org>
- Specfile auto-generated by Mezzanine - Specfile auto-generated by Mezzanine

1
opal/mca/pmix/pmix2x/pmix/contrib/pmix_jenkins.sh
Просмотреть файл

@ -395,3 +395,4 @@ if [ -n "$JENKINS_RUN_TESTS" -a "$JENKINS_RUN_TESTS" -ne "0" ]; then
set -e set -e
fi fi
fi fi

2
opal/mca/pmix/pmix2x/pmix/contrib/whitespace-purge.sh
Просмотреть файл

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. # Copyright (c) 2015 Intel, Inc. 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) 2015 Cisco Systems, Inc. # Copyright (c) 2015 Cisco Systems, Inc.

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

@ -11,7 +11,7 @@
# 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-2017 Intel, Inc. All rights reserved. # Copyright (c) 2013-2016 Intel, Inc. All rights reserved
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

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

@ -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) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016-2017 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.
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
@ -759,6 +759,7 @@ typedef struct pmix_value {
if (NULL != (m)->data.darray->array) { \ if (NULL != (m)->data.darray->array) { \
free((m)->data.darray->array); \ free((m)->data.darray->array); \
} \ } \
free((m)->data.darray); \
/**** DEPRECATED ****/ \ /**** DEPRECATED ****/ \
} else if (PMIX_INFO_ARRAY == (m)->type) { \ } else if (PMIX_INFO_ARRAY == (m)->type) { \
pmix_info_t *_p = (pmix_info_t*)((m)->data.array->array); \ pmix_info_t *_p = (pmix_info_t*)((m)->data.array->array); \

2
opal/mca/pmix/pmix2x/pmix/include/pmix_server.h
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2016 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 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science

1
opal/mca/pmix/pmix2x/pmix/include/pmix_version.h.in
Просмотреть файл

@ -1,7 +1,6 @@
/* /*
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/buffer_ops/types.h
Просмотреть файл

@ -12,7 +12,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2011 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) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/buffer_ops/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-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 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.

2
opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c
Просмотреть файл

@ -11,7 +11,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science * Copyright (c) 2014-2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.c
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007 Voltaire All rights reserved. * Copyright (c) 2007 Voltaire All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.h
Просмотреть файл

@ -13,7 +13,7 @@
* Copyright (c) 2007 Voltaire All rights reserved. * Copyright (c) 2007 Voltaire All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights * Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

3
opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Intel, 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.
* $COPYRIGHT$ * $COPYRIGHT$
@ -224,3 +224,4 @@ static void expand_array(void)
classes[i] = NULL; classes[i] = NULL;
} }
} }

3
opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016-2017 Intel, Inc. All rights reserved. * Copyright (c) 2016 Intel, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -64,3 +64,4 @@ int pmix_value_array_set_size(pmix_value_array_t* array, size_t size)
array->array_size = size; array->array_size = size;
return PMIX_SUCCESS; return PMIX_SUCCESS;
} }

2
opal/mca/pmix/pmix2x/pmix/src/client/Makefile.include
Просмотреть файл

@ -1,6 +1,6 @@
# -*- makefile -*- # -*- makefile -*-
# #
# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. # Copyright (c) 2014-2015 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) 2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.

28
opal/mca/pmix/pmix2x/pmix/src/client/pmi1.c
Просмотреть файл

@ -202,6 +202,30 @@ PMIX_EXPORT int PMI_KVS_Get( const char kvsname[], const char key[], char value[
pmix_output_verbose(2, pmix_globals.debug_output, pmix_output_verbose(2, pmix_globals.debug_output,
"PMI_KVS_Get: KVS=%s, key=%s value=%s", kvsname, key, value); "PMI_KVS_Get: KVS=%s, key=%s value=%s", kvsname, key, value);
/* PMI-1 expects resource manager to set
* process mapping in ANL notation. */
if (!strcmp(key, ANL_MAPPING)) {
/* we are looking in the job-data. If there is nothing there
* we don't want to look in rank's data, thus set rank to widcard */
proc = myproc;
proc.rank = PMIX_RANK_WILDCARD;
if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_ANL_MAP, NULL, 0, &val) &&
(NULL != val) && (PMIX_STRING == val->type)) {
strncpy(value, val->data.string, length);
PMIX_VALUE_FREE(val, 1);
return PMI_SUCCESS;
} else {
/* artpol:
* Some RM's (i.e. SLURM) already have ANL precomputed. The export it
* through PMIX_ANL_MAP variable.
* If we haven't found it we want to have our own packing functionality
* since it's common.
* Somebody else has to write it since I've already done that for
* GPL'ed SLURM :) */
return PMI_FAIL;
}
}
/* retrieve the data from PMIx - since we don't have a rank, /* retrieve the data from PMIx - since we don't have a rank,
* we indicate that by passing the UNDEF value */ * we indicate that by passing the UNDEF value */
(void)strncpy(proc.nspace, kvsname, PMIX_MAX_NSLEN); (void)strncpy(proc.nspace, kvsname, PMIX_MAX_NSLEN);
@ -344,6 +368,10 @@ PMIX_EXPORT int PMI_Get_appnum(int *appnum)
if (PMIX_SUCCESS == rc) { if (PMIX_SUCCESS == rc) {
rc = convert_int(appnum, val); rc = convert_int(appnum, val);
PMIX_VALUE_RELEASE(val); PMIX_VALUE_RELEASE(val);
} else if( PMIX_ERR_NOT_FOUND == rc ){
/* this is optional value, set to 0 */
*appnum = 0;
rc = PMIX_SUCCESS;
} }
PMIX_INFO_DESTRUCT(&info[0]); PMIX_INFO_DESTRUCT(&info[0]);

28
opal/mca/pmix/pmix2x/pmix/src/client/pmi2.c
Просмотреть файл

@ -36,6 +36,7 @@
#include "src/util/output.h" #include "src/util/output.h"
#include "src/include/pmix_globals.h" #include "src/include/pmix_globals.h"
#define ANL_MAPPING "PMI_process_mapping"
#define PMI2_CHECK() \ #define PMI2_CHECK() \
do { \ do { \
@ -505,6 +506,33 @@ PMIX_EXPORT int PMI2_Info_GetJobAttr(const char name[], char value[], int valuel
PMIX_INFO_CONSTRUCT(&info[0]); PMIX_INFO_CONSTRUCT(&info[0]);
PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL); PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL);
/* PMI-2 expects resource manager to set
* process mapping in ANL notation. */
if (!strcmp(name, ANL_MAPPING)) {
/* we are looking in the job-data. If there is nothing there
* we don't want to look in rank's data, thus set rank to widcard */
proc = myproc;
proc.rank = PMIX_RANK_WILDCARD;
if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_ANL_MAP, NULL, 0, &val) &&
(NULL != val) && (PMIX_STRING == val->type)) {
strncpy(value, val->data.string, valuelen);
PMIX_VALUE_FREE(val, 1);
*found = 1;
return PMI2_SUCCESS;
} else {
/* artpol:
* Some RM's (i.e. SLURM) already have ANL precomputed. The export it
* through PMIX_ANL_MAP variable.
* If we haven't found it we want to have our own packing functionality
* since it's common.
* Somebody else has to write it since I've already done that for
* GPL'ed SLURM :) */
*found = 1;
return PMI2_FAIL;
}
}
*found = 0; *found = 0;
rc = PMIx_Get(&proc, name, info, 1, &val); rc = PMIx_Get(&proc, name, info, 1, &val);
if (PMIX_SUCCESS == rc && NULL != val) { if (PMIX_SUCCESS == rc && NULL != val) {

3
opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.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-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science * Copyright (c) 2014-2015 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>.
@ -254,3 +254,4 @@ static void op_cbfunc(pmix_status_t status, void *cbdata)
cb->status = status; cb->status = status;
cb->active = false; cb->active = false;
} }

38
opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_get.c
Просмотреть файл

@ -596,8 +596,16 @@ static void _getnbfn(int fd, short flags, void *cbdata)
return; return;
} }
/* should be in the internal hash table. */
#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1) #if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
rc = pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val);
if (PMIX_SUCCESS != rc) {
rc = pmix_dstore_fetch(cb->nspace, cb->rank, cb->key, &val);
}
if (PMIX_SUCCESS == rc) {
#else
if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val))) { if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val))) {
#endif
/* if this is a compressed string, then uncompress it */ /* if this is a compressed string, then uncompress it */
if (PMIX_COMPRESSED_STRING == val->type) { if (PMIX_COMPRESSED_STRING == val->type) {
pmix_util_uncompress_string(&tmp, (uint8_t*)val->data.bo.bytes, val->data.bo.size); pmix_util_uncompress_string(&tmp, (uint8_t*)val->data.bo.bytes, val->data.bo.size);
@ -621,40 +629,10 @@ static void _getnbfn(int fd, short flags, void *cbdata)
PMIX_RELEASE(cb); PMIX_RELEASE(cb);
return; return;
} }
#endif
/* if the key is in the PMIx namespace, then they are looking for data /* if the key is in the PMIx namespace, then they are looking for data
* that was provided at startup */ * that was provided at startup */
if (0 == strncmp(cb->key, "pmix", 4)) { if (0 == strncmp(cb->key, "pmix", 4)) {
/* should be in the internal hash table. */
#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
if (PMIX_SUCCESS == (rc = pmix_dstore_fetch(cb->nspace, cb->rank, cb->key, &val))) {
#else
if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val))) {
#endif
/* if this is a compressed string, then uncompress it */
if (PMIX_COMPRESSED_STRING == val->type) {
pmix_util_uncompress_string(&tmp, (uint8_t*)val->data.bo.bytes, val->data.bo.size);
if (NULL == tmp) {
PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
rc = PMIX_ERR_NOMEM;
PMIX_VALUE_RELEASE(val);
val = NULL;
} else {
PMIX_VALUE_DESTRUCT(val);
PMIX_VAL_ASSIGN(val, string, tmp);
}
}
/* found it - we are in an event, so we can
* just execute the callback */
cb->value_cbfunc(rc, val, cb->cbdata);
/* cleanup */
if (NULL != val) {
PMIX_VALUE_RELEASE(val);
}
PMIX_RELEASE(cb);
return;
}
/* if we don't have it, go request it */ /* if we don't have it, go request it */
goto request; goto request;
} }

2
opal/mca/pmix/pmix2x/pmix/src/common/Makefile.include
Просмотреть файл

@ -1,6 +1,6 @@
# -*- makefile -*- # -*- makefile -*-
# #
# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. # Copyright (c) 2015 Intel, Inc. All rights reserved.
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #

2
opal/mca/pmix/pmix2x/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-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 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.

1
opal/mca/pmix/pmix2x/pmix/src/dstore/Makefile.include
Просмотреть файл

@ -1,6 +1,5 @@
# Copyright (c) 2015-2016 Mellanox Technologies, Inc. # Copyright (c) 2015-2016 Mellanox Technologies, Inc.
# All rights reserved. # All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_dstore.c
Просмотреть файл

@ -1,7 +1,6 @@
/* /*
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

114
opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.c
Просмотреть файл

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2015-2016 Mellanox Technologies, Inc. * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016-2017 Intel, Inc. All rights reserved. * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -225,7 +225,7 @@ static void _update_initial_segment_info(const ns_map_data_t *ns_map);
static void _set_constants_from_env(void); static void _set_constants_from_env(void);
static void _delete_sm_desc(seg_desc_t *desc); static void _delete_sm_desc(seg_desc_t *desc);
static int _pmix_getpagesize(void); static int _pmix_getpagesize(void);
static inline uint32_t _get_univ_size(const char *nspace); static inline ssize_t _get_univ_size(const char *nspace);
static inline ns_map_data_t * _esh_session_map_search_server(const char *nspace); static inline ns_map_data_t * _esh_session_map_search_server(const char *nspace);
static inline ns_map_data_t * _esh_session_map_search_client(const char *nspace); static inline ns_map_data_t * _esh_session_map_search_client(const char *nspace);
@ -289,12 +289,14 @@ static void ncon(ns_track_elem_t *p) {
p->data_seg = NULL; p->data_seg = NULL;
p->num_meta_seg = 0; p->num_meta_seg = 0;
p->num_data_seg = 0; p->num_data_seg = 0;
p->in_use = true;
} }
static void ndes(ns_track_elem_t *p) { static void ndes(ns_track_elem_t *p) {
_delete_sm_desc(p->meta_seg); _delete_sm_desc(p->meta_seg);
_delete_sm_desc(p->data_seg); _delete_sm_desc(p->data_seg);
memset(&p->ns_map, 0, sizeof(p->ns_map)); memset(&p->ns_map, 0, sizeof(p->ns_map));
p->in_use = false;
} }
PMIX_CLASS_INSTANCE(ns_track_elem_t, PMIX_CLASS_INSTANCE(ns_track_elem_t,
@ -588,10 +590,23 @@ static inline void _esh_sessions_cleanup(void)
static inline void _esh_ns_track_cleanup(void) static inline void _esh_ns_track_cleanup(void)
{ {
int size;
ns_track_elem_t *ns_trk;
if (NULL == _ns_track_array) { if (NULL == _ns_track_array) {
return; return;
} }
size = pmix_value_array_get_size(_ns_track_array);
ns_trk = PMIX_VALUE_ARRAY_GET_BASE(_ns_track_array, ns_track_elem_t);
for (int i = 0; i < size; i++) {
ns_track_elem_t *trk = ns_trk + i;
if (trk->in_use) {
PMIX_DESTRUCT(trk);
}
}
PMIX_RELEASE(_ns_track_array); PMIX_RELEASE(_ns_track_array);
_ns_track_array = NULL; _ns_track_array = NULL;
} }
@ -1086,8 +1101,6 @@ int _esh_store(const char *nspace, pmix_rank_t rank, pmix_kval_t *kv)
rc = _store_data_for_rank(elem, rank, &xfer); rc = _store_data_for_rank(elem, rank, &xfer);
xfer.base_ptr = NULL;
xfer.bytes_used = 0;
PMIX_DESTRUCT(&xfer); PMIX_DESTRUCT(&xfer);
if (PMIX_SUCCESS != rc) { if (PMIX_SUCCESS != rc) {
@ -1156,8 +1169,13 @@ int _esh_fetch(const char *nspace, pmix_rank_t rank, const char *key, pmix_value
} }
if (PMIX_RANK_UNDEF == rank) { if (PMIX_RANK_UNDEF == rank) {
nprocs = _get_univ_size(ns_map->name); ssize_t _nprocs = _get_univ_size(ns_map->name);
cur_rank = PMIX_RANK_UNDEF; if( 0 > _nprocs ){
PMIX_ERROR_LOG(rc);
return rc;
}
nprocs = (size_t) _nprocs;
cur_rank = 0;
} else { } else {
nprocs = 1; nprocs = 1;
cur_rank = rank; cur_rank = rank;
@ -1219,9 +1237,6 @@ int _esh_fetch(const char *nspace, pmix_rank_t rank, const char *key, pmix_value
data_seg = elem->data_seg; data_seg = elem->data_seg;
while (nprocs--) { while (nprocs--) {
if (PMIX_RANK_UNDEF == rank) {
cur_rank++;
}
/* Get the rank meta info in the shared meta segment. */ /* Get the rank meta info in the shared meta segment. */
rinfo = _get_rank_meta_info(cur_rank, meta_seg); rinfo = _get_rank_meta_info(cur_rank, meta_seg);
if (NULL == rinfo) { if (NULL == rinfo) {
@ -1319,6 +1334,10 @@ int _esh_fetch(const char *nspace, pmix_rank_t rank, const char *key, pmix_value
kval_cnt--; kval_cnt--;
} }
} }
if (PMIX_RANK_UNDEF == rank) {
cur_rank++;
}
} }
done: done:
@ -2171,7 +2190,7 @@ static size_t put_data_to_the_end(ns_track_elem_t *ns_info, seg_desc_t *dataseg,
static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t *kval, rank_meta_info **rinfo, int data_exist) static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t *kval, rank_meta_info **rinfo, int data_exist)
{ {
size_t offset, size, kval_cnt; size_t offset, size, kval_cnt;
pmix_buffer_t *buffer; pmix_buffer_t buffer;
pmix_status_t rc; pmix_status_t rc;
seg_desc_t *datadesc; seg_desc_t *datadesc;
uint8_t *addr; uint8_t *addr;
@ -2182,24 +2201,23 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t
datadesc = ns_info->data_seg; datadesc = ns_info->data_seg;
/* pack value to the buffer */ /* pack value to the buffer */
buffer = PMIX_NEW(pmix_buffer_t); PMIX_CONSTRUCT(&buffer, pmix_buffer_t);
if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(buffer, kval->value, 1, PMIX_VALUE))) { if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&buffer, kval->value, 1, PMIX_VALUE))) {
PMIX_RELEASE(buffer);
PMIX_ERROR_LOG(rc); PMIX_ERROR_LOG(rc);
return rc; goto exit;
} }
size = buffer->bytes_used; size = buffer.bytes_used;
if (0 == data_exist) { if (0 == data_exist) {
/* there is no data blob for this rank yet, so add it. */ /* there is no data blob for this rank yet, so add it. */
size_t free_offset; size_t free_offset;
free_offset = get_free_offset(datadesc); free_offset = get_free_offset(datadesc);
offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer->base_ptr, size); offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer.base_ptr, size);
if (0 == offset) { if (0 == offset) {
/* this is an error */ /* this is an error */
PMIX_RELEASE(buffer); rc = PMIX_ERROR;
PMIX_ERROR_LOG(PMIX_ERROR); PMIX_ERROR_LOG(rc);
return PMIX_ERROR; goto exit;
} }
/* if it's the first time when we put data for this rank, then *rinfo == NULL, /* if it's the first time when we put data for this rank, then *rinfo == NULL,
* and even if segment was extended, and data was put into the next segment, * and even if segment was extended, and data was put into the next segment,
@ -2225,9 +2243,9 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t
/* there is data blob for this rank */ /* there is data blob for this rank */
addr = _get_data_region_by_offset(datadesc, (*rinfo)->offset); addr = _get_data_region_by_offset(datadesc, (*rinfo)->offset);
if (NULL == addr) { if (NULL == addr) {
PMIX_RELEASE(buffer); rc = PMIX_ERROR;
PMIX_ERROR_LOG(PMIX_ERROR); PMIX_ERROR_LOG(rc);
return rc; goto exit;
} }
/* go through previous data region and find key matches. /* go through previous data region and find key matches.
* If one is found, then mark this kval as invalidated. * If one is found, then mark this kval as invalidated.
@ -2254,9 +2272,9 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t
/* go to next item, updating address */ /* go to next item, updating address */
addr = _get_data_region_by_offset(datadesc, offset); addr = _get_data_region_by_offset(datadesc, offset);
if (NULL == addr) { if (NULL == addr) {
PMIX_RELEASE(buffer); rc = PMIX_ERROR;
PMIX_ERROR_LOG(PMIX_ERROR); PMIX_ERROR_LOG(rc);
return rc; goto exit;
} }
} else { } else {
/* should not be, we should be out of cycle when this happens */ /* should not be, we should be out of cycle when this happens */
@ -2284,7 +2302,7 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t
__FILE__, __LINE__, __func__, rank, data_exist, kval->key, kval->value->type)); __FILE__, __LINE__, __func__, rank, data_exist, kval->key, kval->value->type));
/* replace old data with new one. */ /* replace old data with new one. */
memset(ESH_DATA_PTR(addr), 0, ESH_DATA_SIZE(addr, ESH_DATA_PTR(addr))); memset(ESH_DATA_PTR(addr), 0, ESH_DATA_SIZE(addr, ESH_DATA_PTR(addr)));
memcpy(ESH_DATA_PTR(addr), buffer->base_ptr, size); memcpy(ESH_DATA_PTR(addr), buffer.base_ptr, size);
addr += ESH_KV_SIZE(addr); addr += ESH_KV_SIZE(addr);
add_to_the_end = 0; add_to_the_end = 0;
break; break;
@ -2310,11 +2328,11 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t
(*rinfo)->count++; (*rinfo)->count++;
free_offset = get_free_offset(datadesc); free_offset = get_free_offset(datadesc);
/* add to the end */ /* add to the end */
offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer->base_ptr, size); offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer.base_ptr, size);
if (0 == offset) { if (0 == offset) {
PMIX_RELEASE(buffer); rc = PMIX_ERROR;
PMIX_ERROR_LOG(PMIX_ERROR); PMIX_ERROR_LOG(rc);
return PMIX_ERROR; goto exit;
} }
/* we just reached the end of data for the target rank, and there can be two cases: /* we just reached the end of data for the target rank, and there can be two cases:
* (1) - we are in the middle of data segment; data for this rank is separated from * (1) - we are in the middle of data segment; data for this rank is separated from
@ -2343,9 +2361,8 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t
__FILE__, __LINE__, __func__, rank, data_exist, kval->key)); __FILE__, __LINE__, __func__, rank, data_exist, kval->key));
} }
} }
buffer->base_ptr = NULL; exit:
buffer->bytes_used = 0; PMIX_DESTRUCT(&buffer);
PMIX_RELEASE(buffer);
return rc; return rc;
} }
@ -2446,26 +2463,23 @@ static int _store_data_for_rank(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix
return rc; return rc;
} }
static inline uint32_t _get_univ_size(const char *nspace) static inline ssize_t _get_univ_size(const char *nspace)
{ {
pmix_value_t *val = NULL; ssize_t nprocs = 0;
uint32_t nprocs = 0; pmix_value_t *val;
pmix_nspace_t *ns, *nptr; int rc;
nptr = NULL; rc = _esh_fetch(nspace, PMIX_RANK_WILDCARD, PMIX_UNIV_SIZE, &val);
PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) { if( PMIX_SUCCESS != rc ) {
if (0 == strcmp(nspace, ns->nspace)) { PMIX_ERROR_LOG(rc);
nptr = ns; return rc;
break;
}
} }
if( val->type != PMIX_UINT32 ){
if (nptr && (PMIX_SUCCESS == pmix_hash_fetch(&nptr->internal, PMIX_RANK_WILDCARD, PMIX_UNIV_SIZE, &val))) { rc = PMIX_ERR_BAD_PARAM;
if (val->type == PMIX_UINT32) { PMIX_ERROR_LOG(rc);
nprocs = val->data.uint32; return rc;
}
PMIX_VALUE_RELEASE(val);
} }
nprocs = (ssize_t)val->data.uint32;
PMIX_VALUE_RELEASE(val);
return nprocs; return nprocs;
} }

4
opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.h
Просмотреть файл

@ -1,7 +1,8 @@
/* /*
* Copyright (c) 2015-2016 Mellanox Technologies, Inc. * Copyright (c) 2015-2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved. * Copyright (c) 2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -114,6 +115,7 @@ typedef struct {
size_t num_data_seg; size_t num_data_seg;
seg_desc_t *meta_seg; seg_desc_t *meta_seg;
seg_desc_t *data_seg; seg_desc_t *data_seg;
bool in_use;
} ns_track_elem_t; } ns_track_elem_t;
extern pmix_dstore_base_module_t pmix_dstore_esh_module; extern pmix_dstore_base_module_t pmix_dstore_esh_module;

2
opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_notification.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-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/include/align.h
Просмотреть файл

@ -12,7 +12,6 @@
* Copyright (c) 2006 Voltaire All rights reserved. * Copyright (c) 2006 Voltaire All rights reserved.
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
* *
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/include/hash_string.h
Просмотреть файл

@ -2,7 +2,6 @@
* Copyright (c) 2004-2007 The University of Tennessee and The University * Copyright (c) 2004-2007 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/include/pmix_config_top.h
Просмотреть файл

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
* Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *

1
opal/mca/pmix/pmix2x/pmix/src/include/pmix_jobdata.h
Просмотреть файл

@ -1,7 +1,6 @@
/* /*
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/include/prefetch.h
Просмотреть файл

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2004-2006 The Regents of the University of California. * Copyright (c) 2004-2006 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/base/Makefile.am
Просмотреть файл

@ -10,7 +10,6 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-base.txt
Просмотреть файл

@ -11,7 +11,6 @@
# 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) 2008-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-var.txt
Просмотреть файл

@ -13,7 +13,6 @@
# Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights # Copyright (c) 2013 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

3
opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016-2017 Intel, Inc. All rights reserved. * Copyright (c) 2016 Intel, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -149,3 +149,4 @@ char * pmix_mca_base_component_to_string(const pmix_mca_base_component_t *a) {
} }
return str; return str;
} }

1
opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am
Просмотреть файл

@ -3,7 +3,6 @@
# University Research and Technology # University Research and Technology
# Corporation. All rights reserved. # Corporation. All rights reserved.
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/Makefile.am
Просмотреть файл

@ -1,6 +1,5 @@
# #
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c
Просмотреть файл

@ -4,7 +4,6 @@
* All rights reserved. * All rights reserved.
* *
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.

1
opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h
Просмотреть файл

@ -3,7 +3,6 @@
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. 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) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am
Просмотреть файл

@ -2,7 +2,6 @@
# Copyright (c) 2004-2010 The Trustees of Indiana University. # Copyright (c) 2004-2010 The Trustees of Indiana University.
# All rights reserved. # All rights reserved.
# Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/configure.m4
Просмотреть файл

@ -4,7 +4,6 @@
# 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) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_component.c
Просмотреть файл

@ -3,7 +3,6 @@
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. 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) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pif/Makefile.am
Просмотреть файл

@ -1,6 +1,5 @@
# #
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c
Просмотреть файл

@ -1,7 +1,6 @@
/* /*
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c
Просмотреть файл

@ -1,7 +1,6 @@
/* /*
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/pif_linux_ipv6.c
Просмотреть файл

@ -1,7 +1,6 @@
/* /*
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/pif_posix.c
Просмотреть файл

@ -4,7 +4,7 @@
* Copyright (c) 2013 The University of Tennessee and The University * Copyright (c) 2013 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

1
opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/Makefile.am
Просмотреть файл

@ -1,7 +1,6 @@
# #
# Copyright (c) 2006 Los Alamos National Security, LLC. All rights # Copyright (c) 2006 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

3
opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/configure.m4
Просмотреть файл

@ -3,7 +3,7 @@
# Copyright (c) 2006 Los Alamos National Security, LLC. All rights # Copyright (c) 2006 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. # Copyright (c) 2016 Intel, 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.
# $COPYRIGHT$ # $COPYRIGHT$
@ -29,3 +29,4 @@ AC_DEFUN([MCA_pmix_pinstalldirs_config_CONFIG],[
AC_CONFIG_FILES([src/mca/pinstalldirs/config/Makefile AC_CONFIG_FILES([src/mca/pinstalldirs/config/Makefile
src/mca/pinstalldirs/config/pinstall_dirs.h]) src/mca/pinstalldirs/config/pinstall_dirs.h])
]) ])

1
opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am поставляемый
Просмотреть файл

@ -3,7 +3,6 @@
# reserved. # reserved.
# Copyright (c) 2009 High Performance Computing Center Stuttgart, # Copyright (c) 2009 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved. # University of Stuttgart. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

3
opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/configure.m4 поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
# Copyright (c) 2006 Los Alamos National Security, LLC. All rights # Copyright (c) 2006 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. # Copyright (c) 2016 Intel, 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.
# $COPYRIGHT$ # $COPYRIGHT$
@ -27,3 +27,4 @@ AC_DEFUN([MCA_pmix_pinstalldirs_env_COMPILE_MODE], [
AC_DEFUN([MCA_pmix_pinstalldirs_env_CONFIG], [ AC_DEFUN([MCA_pmix_pinstalldirs_env_CONFIG], [
AC_CONFIG_FILES([src/mca/pinstalldirs/env/Makefile]) AC_CONFIG_FILES([src/mca/pinstalldirs/env/Makefile])
]) ])

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/Makefile.am
Просмотреть файл

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. # Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. # Copyright (c) 2013-2016 Intel, Inc. All rights reserved
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/Makefile.include
Просмотреть файл

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. # Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. # Copyright (c) 2013-2016 Intel, Inc. All rights reserved
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/base.h
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 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$

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_fns.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) 2015-2017 Intel, Inc. All rights reserved. * Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2016 Mellanox Technologies, Inc. * Copyright (c) 2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* *

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_frame.c
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 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$

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016-2017 Intel, Inc. All rights reserved. * Copyright (c) 2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/Makefile.am
Просмотреть файл

@ -11,7 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. # Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. # Copyright (c) 2013-2016 Intel, Inc. All rights reserved
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4
Просмотреть файл

@ -12,7 +12,7 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013 Sandia National Laboratories. All rights reserved. # Copyright (c) 2013 Sandia National Laboratories. All rights reserved.
# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. # Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved. * Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
* *

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_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-2017 Intel, Inc. All rights reserved. * Copyright (c) 2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h
Просмотреть файл

@ -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) 2007-2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved. * Copyright (c) 2015-2016 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.

2
opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/base.h
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 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$

1
opal/mca/pmix/pmix2x/pmix/src/runtime/help-pmix-runtime.txt
Просмотреть файл

@ -12,7 +12,6 @@
# All rights reserved. # 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) 2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow

2
opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_finalize.c
Просмотреть файл

@ -12,7 +12,7 @@
* Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010-2015 Los Alamos National Security, LLC. * Copyright (c) 2010-2015 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2016 Intel, 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.
* $COPYRIGHT$ * $COPYRIGHT$

2
opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_init.c
Просмотреть файл

@ -15,7 +15,7 @@
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2010-2015 Los Alamos National Security, LLC. * Copyright (c) 2010-2015 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved. * Copyright (c) 2013-2016 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$

15
opal/mca/pmix/pmix2x/pmix/src/server/pmix_server.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-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 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-2015 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84@gmail.com>.
* All rights reserved. * All rights reserved.
@ -242,6 +242,8 @@ static void cleanup_server_state(void)
PMIX_LIST_DESTRUCT(&pmix_server_globals.remote_pnd); PMIX_LIST_DESTRUCT(&pmix_server_globals.remote_pnd);
PMIX_LIST_DESTRUCT(&pmix_server_globals.local_reqs); PMIX_LIST_DESTRUCT(&pmix_server_globals.local_reqs);
PMIX_DESTRUCT(&pmix_server_globals.gdata); PMIX_DESTRUCT(&pmix_server_globals.gdata);
PMIX_DESTRUCT(&pmix_server_globals.notifications);
PMIX_LIST_DESTRUCT(&pmix_server_globals.events);
if (NULL != security_mode) { if (NULL != security_mode) {
free(security_mode); free(security_mode);
@ -271,6 +273,10 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void)
cleanup_server_state(); cleanup_server_state();
pmix_output_verbose(2, pmix_globals.debug_output, pmix_output_verbose(2, pmix_globals.debug_output,
"pmix:server finalize complete"); "pmix:server finalize complete");
/* finalize the class/object system */
pmix_class_finalize();
return PMIX_SUCCESS; return PMIX_SUCCESS;
} }
@ -1702,7 +1708,7 @@ static void _mdxcbfunc(int sd, short argc, void *cbdata)
{ {
pmix_shift_caddy_t *scd = (pmix_shift_caddy_t*)cbdata; pmix_shift_caddy_t *scd = (pmix_shift_caddy_t*)cbdata;
pmix_server_trkr_t *tracker = scd->tracker; pmix_server_trkr_t *tracker = scd->tracker;
pmix_buffer_t xfer, *bptr, *databuf, *bpscope, *reply; pmix_buffer_t xfer, *bptr, *databuf=NULL, *bpscope, *reply;
pmix_nspace_t *nptr, *ns; pmix_nspace_t *nptr, *ns;
pmix_server_caddy_t *cd; pmix_server_caddy_t *cd;
char *nspace; char *nspace;
@ -1775,6 +1781,7 @@ static void _mdxcbfunc(int sd, short argc, void *cbdata)
*/ */
pmix_output_verbose(8, pmix_globals.debug_output, pmix_output_verbose(8, pmix_globals.debug_output,
"modex_cbfunc: unknown nspace %s, Fence ", nspace); "modex_cbfunc: unknown nspace %s, Fence ", nspace);
free(nspace);
/* /*
* TODO: if some namespaces are OK and the bad one is not the first * TODO: if some namespaces are OK and the bad one is not the first
* the server is in inconsistent state. Should we rely on the client to abort * the server is in inconsistent state. Should we rely on the client to abort
@ -1783,6 +1790,7 @@ static void _mdxcbfunc(int sd, short argc, void *cbdata)
rc = PMIX_ERR_INVALID_NAMESPACE; rc = PMIX_ERR_INVALID_NAMESPACE;
goto finish_collective; goto finish_collective;
} }
free(nspace);
/* unpack the rank */ /* unpack the rank */
cnt = 1; cnt = 1;
@ -1841,6 +1849,9 @@ static void _mdxcbfunc(int sd, short argc, void *cbdata)
} }
finish_collective: finish_collective:
if(NULL != databuf) {
PMIX_RELEASE(databuf);
}
/* setup the reply, starting with the returned status */ /* setup the reply, starting with the returned status */
reply = PMIX_NEW(pmix_buffer_t); reply = PMIX_NEW(pmix_buffer_t);
if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &rc, 1, PMIX_STATUS))) { if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &rc, 1, PMIX_STATUS))) {

4
opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.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-2017 Intel, Inc. All rights reserved. * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 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-2015 Artem Y. Polyakov <artpol84@gmail.com>. * Copyright (c) 2014-2015 Artem Y. Polyakov <artpol84@gmail.com>.
* All rights reserved. * All rights reserved.
@ -555,7 +555,6 @@ pmix_status_t pmix_server_fence(pmix_server_caddy_t *cd,
/* add this contributor to the tracker so they get /* add this contributor to the tracker so they get
* notified when we are done */ * notified when we are done */
PMIX_RETAIN(cd);
pmix_list_append(&trk->local_cbs, &cd->super); pmix_list_append(&trk->local_cbs, &cd->super);
/* if all local contributions have been received, /* if all local contributions have been received,
* let the local host's server know that we are at the * let the local host's server know that we are at the
@ -991,6 +990,7 @@ pmix_status_t pmix_server_connect(pmix_server_caddy_t *cd,
cleanup: cleanup:
PMIX_PROC_FREE(procs, nprocs); PMIX_PROC_FREE(procs, nprocs);
PMIX_INFO_FREE(info, ninfo); PMIX_INFO_FREE(info, ninfo);
PMIX_RELEASE(cd);
return rc; return rc;
} }

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше