From eb69df02ae5cda531f9855acdd18fe62f989ae51 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 15 Aug 2017 19:55:50 -0700 Subject: [PATCH] Update to PMIx v2.1.0rc1 Signed-off-by: Ralph Castain --- opal/mca/pmix/pmix2x/pmix/VERSION | 4 +- .../pmix2x/pmix/config/pmix_check_package.m4 | 2 +- .../pmix/pmix2x/pmix/config/pmix_functions.m4 | 2 +- .../pmix/pmix2x/pmix/config/pmix_setup_cc.m4 | 2 +- .../pmix/pmix2x/pmix/include/pmix_common.h | 20 +- .../pmix2x/pmix/src/atomics/sys/arm/timer.h | 1 - .../pmix2x/pmix/src/atomics/sys/arm64/timer.h | 1 - .../pmix2x/pmix/src/atomics/sys/atomic_impl.h | 1 - .../pmix2x/pmix/src/atomics/sys/ia32/timer.h | 1 - .../pmix2x/pmix/src/atomics/sys/ia64/timer.h | 1 - .../pmix2x/pmix/src/atomics/sys/mips/timer.h | 1 - .../pmix/src/atomics/sys/powerpc/timer.h | 1 - .../pmix/src/atomics/sys/sparcv9/timer.h | 1 - .../pmix2x/pmix/src/class/Makefile.include | 2 +- .../pmix2x/pmix/src/class/pmix_hash_table.c | 2 +- .../pmix/pmix2x/pmix/src/class/pmix_list.c | 2 +- .../pmix/pmix2x/pmix/src/class/pmix_object.c | 2 +- .../pmix2x/pmix/src/class/pmix_ring_buffer.c | 2 +- .../pmix2x/pmix/src/class/pmix_ring_buffer.h | 2 +- .../pmix2x/pmix/src/class/pmix_value_array.c | 2 +- .../pmix/src/client/pmix_client_fence.c | 2 +- .../pmix2x/pmix/src/event/Makefile.include | 2 +- opal/mca/pmix/pmix2x/pmix/src/include/align.h | 1 - .../pmix2x/pmix/src/include/hash_string.h | 1 - .../pmix2x/pmix/src/include/pmix_config_top.h | 2 +- .../pmix/src/include/pmix_socket_errno.h | 2 +- .../pmix/pmix2x/pmix/src/mca/Makefile.include | 2 +- .../pmix/pmix2x/pmix/src/mca/base/Makefile.am | 1 - opal/mca/pmix/pmix2x/pmix/src/mca/base/base.h | 2 +- .../pmix/src/mca/base/help-mca-base.txt | 1 - .../pmix2x/pmix/src/mca/base/help-mca-var.txt | 1 - .../pmix/src/mca/base/pmix_mca_base_close.c | 2 +- .../base/pmix_mca_base_component_compare.c | 2 +- .../mca/base/pmix_mca_base_component_find.c | 2 +- .../base/pmix_mca_base_component_repository.c | 1 + .../base/pmix_mca_base_component_repository.h | 2 +- .../mca/base/pmix_mca_base_components_close.c | 2 +- .../mca/base/pmix_mca_base_components_open.c | 2 +- .../base/pmix_mca_base_components_register.c | 2 +- .../base/pmix_mca_base_components_select.c | 2 +- .../src/mca/base/pmix_mca_base_framework.c | 2 +- .../pmix/src/mca/base/pmix_mca_base_list.c | 2 +- .../mca/base/pmix_mca_base_parse_paramfile.c | 2 +- .../src/mca/base/pmix_mca_base_var_enum.c | 2 +- .../src/mca/base/pmix_mca_base_var_enum.h | 2 +- .../src/mca/base/pmix_mca_base_var_group.c | 2 +- .../src/mca/base/pmix_mca_base_var_group.h | 2 +- .../pmix/src/mca/base/pmix_mca_base_vari.h | 2 +- .../pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c | 6 +- opal/mca/pmix/pmix2x/pmix/src/mca/mca.h | 2 +- .../pmix/pmix2x/pmix/src/mca/pdl/Makefile.am | 1 - .../pmix2x/pmix/src/mca/pdl/base/Makefile.am | 1 - .../pmix/pmix2x/pmix/src/mca/pdl/base/base.h | 2 +- .../pmix/src/mca/pdl/base/pdl_base_close.c | 2 +- .../pmix/src/mca/pdl/base/pdl_base_fns.c | 2 +- .../pmix/src/mca/pdl/base/pdl_base_open.c | 2 +- .../pmix/src/mca/pdl/base/pdl_base_select.c | 1 - opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h | 1 - .../pmix/src/mca/pdl/pdlopen/Makefile.am | 1 - .../pmix/src/mca/pdl/pdlopen/pdl_pdlopen.h | 2 +- .../mca/pdl/pdlopen/pdl_pdlopen_component.c | 1 - .../pmix/pmix2x/pmix/src/mca/pif/Makefile.am | 1 - .../pmix2x/pmix/src/mca/pif/base/Makefile.am | 2 +- .../pmix/pmix2x/pmix/src/mca/pif/base/base.h | 2 +- .../src/mca/pif/base/pif_base_components.c | 2 +- .../pmix/src/mca/pif/bsdx_ipv4/Makefile.am | 2 +- .../pmix/src/mca/pif/bsdx_ipv4/configure.m4 | 2 +- .../pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c | 1 - .../pmix/src/mca/pif/bsdx_ipv6/Makefile.am | 2 +- .../pmix/src/mca/pif/bsdx_ipv6/configure.m4 | 2 +- .../src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c | 1 - .../pmix/src/mca/pif/linux_ipv6/Makefile.am | 2 +- .../pmix/src/mca/pif/linux_ipv6/configure.m4 | 2 +- .../src/mca/pif/linux_ipv6/pif_linux_ipv6.c | 1 - opal/mca/pmix/pmix2x/pmix/src/mca/pif/pif.h | 2 +- .../pmix/src/mca/pif/posix_ipv4/Makefile.am | 2 +- .../pmix/src/mca/pif/posix_ipv4/configure.m4 | 2 +- .../pmix/src/mca/pif/posix_ipv4/pif_posix.c | 2 +- .../pmix/src/mca/pif/solaris_ipv6/Makefile.am | 2 +- .../src/mca/pif/solaris_ipv6/configure.m4 | 2 +- .../mca/pif/solaris_ipv6/pif_solaris_ipv6.c | 2 +- .../pmix/src/mca/pinstalldirs/Makefile.am | 2 +- .../src/mca/pinstalldirs/base/Makefile.am | 1 - .../pmix/src/mca/pinstalldirs/base/base.h | 2 +- .../base/pinstalldirs_base_components.c | 2 +- .../base/pinstalldirs_base_expand.c | 2 +- .../src/mca/pinstalldirs/config/Makefile.am | 2 +- .../src/mca/pinstalldirs/config/configure.m4 | 2 +- .../pinstalldirs/config/pinstall_dirs.h.in | 2 +- .../config/pmix_pinstalldirs_config.c | 2 +- .../pmix/src/mca/pinstalldirs/configure.m4 | 2 +- .../pmix/src/mca/pinstalldirs/env/Makefile.am | 1 - .../src/mca/pinstalldirs/env/configure.m4 | 2 +- .../pinstalldirs/env/pmix_pinstalldirs_env.c | 2 +- .../pmix/pmix2x/pmix/src/mca/pnet/Makefile.am | 2 +- .../pmix/src/mca/pnet/base/Makefile.include | 2 +- .../pmix/src/mca/pnet/base/pnet_base_fns.c | 2 +- .../pmix/src/mca/pnet/base/pnet_base_frame.c | 2 +- .../pmix/src/mca/pnet/base/pnet_base_select.c | 2 +- .../pmix2x/pmix/src/mca/pnet/opa/Makefile.am | 2 +- .../pmix2x/pmix/src/mca/pnet/opa/configure.m4 | 2 +- .../pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h | 2 +- .../src/mca/pnet/opa/pnet_opa_component.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h | 2 +- .../pmix/pmix2x/pmix/src/mca/psec/Makefile.am | 2 +- .../pmix/src/mca/psec/base/Makefile.include | 2 +- .../pmix/src/mca/psec/munge/Makefile.am | 2 +- .../pmix/src/mca/psec/munge/configure.m4 | 2 +- .../pmix/src/mca/psec/munge/psec_munge.h | 2 +- .../src/mca/psec/munge/psec_munge_component.c | 2 +- .../pmix/src/mca/psec/native/Makefile.am | 2 +- .../pmix/src/mca/psec/native/psec_native.h | 2 +- .../mca/psec/native/psec_native_component.c | 2 +- .../pmix2x/pmix/src/mca/psec/none/Makefile.am | 2 +- .../pmix2x/pmix/src/mca/psec/none/psec_none.h | 2 +- .../src/mca/psec/none/psec_none_component.c | 2 +- .../pmix/src/mca/pshmem/mmap/Makefile.am | 1 - .../pmix/pmix2x/pmix/src/mca/ptl/Makefile.am | 2 +- .../pmix/src/mca/ptl/base/Makefile.include | 2 +- .../pmix/src/mca/ptl/base/ptl_base_connect.c | 2 +- .../pmix2x/pmix/src/mca/ptl/tcp/Makefile.am | 2 +- .../pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.c | 680 +++++++++++------- .../pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.h | 7 +- .../pmix/src/mca/ptl/tcp/ptl_tcp_component.c | 175 ++++- .../pmix2x/pmix/src/mca/ptl/usock/Makefile.am | 2 +- .../pmix2x/pmix/src/mca/ptl/usock/ptl_usock.h | 2 +- .../pmix2x/pmix/src/runtime/Makefile.include | 2 +- .../pmix/src/server/help-pmix-server.txt | 2 +- .../pmix2x/pmix/src/tool/Makefile.include | 2 +- .../mca/pmix/pmix2x/pmix/src/tool/pmix_tool.c | 9 + .../pmix2x/pmix/src/util/Makefile.include | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/alfg.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/argv.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/argv.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/basename.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/compress.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/compress.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/crc.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/crc.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/fd.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/fd.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/getid.c | 2 +- .../pmix2x/pmix/src/util/keyval/Makefile.am | 2 +- .../pmix2x/pmix/src/util/keyval/keyval_lex.h | 2 +- .../pmix2x/pmix/src/util/keyval/keyval_lex.l | 1 - .../pmix/pmix2x/pmix/src/util/keyval_parse.c | 2 +- .../pmix/pmix2x/pmix/src/util/keyval_parse.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/net.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/os_path.c | 2 +- .../pmix/pmix2x/pmix/src/util/parse_options.c | 2 +- .../pmix/pmix2x/pmix/src/util/parse_options.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/path.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/pif.h | 2 +- .../pmix/pmix2x/pmix/src/util/pmix_environ.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/printf.c | 2 +- .../pmix/pmix2x/pmix/src/util/show_help_lex.h | 2 +- .../pmix/pmix2x/pmix/src/util/show_help_lex.l | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/timings.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/tsd.h | 2 +- opal/mca/pmix/pmix2x/pmix/test/Makefile.am | 2 - opal/mca/pmix/pmix2x/pmix/test/test_cd.c | 10 +- opal/mca/pmix/pmix2x/pmix/test/test_common.h | 10 +- opal/mca/pmix/pmix2x/pmix/test/test_fence.c | 4 +- opal/mca/pmix/pmix2x/pmix/test/test_spawn.c | 10 +- opal/mca/pmix/pmix2x/pmix/test/utils.c | 2 +- 166 files changed, 710 insertions(+), 507 deletions(-) diff --git a/opal/mca/pmix/pmix2x/pmix/VERSION b/opal/mca/pmix/pmix2x/pmix/VERSION index 8c7348d8cd..8cea964f47 100644 --- a/opal/mca/pmix/pmix2x/pmix/VERSION +++ b/opal/mca/pmix/pmix2x/pmix/VERSION @@ -30,7 +30,7 @@ greek= # command, or with the date (if "git describe" fails) in the form of # "date". -repo_rev=gite38cd0a +repo_rev=git1aea5a0 # If tarball_version is not empty, it is used as the version string in # the tarball filename, regardless of all other versions listed in @@ -44,7 +44,7 @@ tarball_version= # The date when this release was created -date="Aug 10, 2017" +date="Aug 15, 2017" # The shared library version of each of PMIx's public libraries. # These versions are maintained in accordance with the "Library diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4 index 283c59bd6a..babb542cde 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4 @@ -12,7 +12,7 @@ # 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) 2014-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2014 Intel, Inc. All rights reserved. # Copyright (c) 2017 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_functions.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_functions.m4 index ce83b3b207..e0f3a93cb6 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_functions.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_functions.m4 @@ -13,7 +13,7 @@ dnl All rights reserved. dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. -dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2013-2016 Intel, Inc. All rights reserved. dnl Copyright (c) 2017 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_setup_cc.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_setup_cc.m4 index 3029ffa526..bc45f5bf16 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_setup_cc.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_setup_cc.m4 @@ -16,7 +16,7 @@ dnl Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights dnl reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. -dnl Copyright (c) 2015-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2015-2016 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/include/pmix_common.h b/opal/mca/pmix/pmix2x/pmix/include/pmix_common.h index cf39c25b71..13b8e19cc9 100644 --- a/opal/mca/pmix/pmix2x/pmix/include/pmix_common.h +++ b/opal/mca/pmix/pmix2x/pmix/include/pmix_common.h @@ -120,21 +120,24 @@ typedef uint32_t pmix_rank_t; #define PMIX_SERVER_REMOTE_CONNECTIONS "pmix.srvr.remote" // (bool) Allow connections from remote tools (do not use loopback device) #define PMIX_SERVER_SYSTEM_SUPPORT "pmix.srvr.sys" // (bool) The host RM wants to declare itself as being the local // system server for PMIx connection requests -#define PMIX_SERVER_PIDINFO "pmix.srvr.pidinfo" // (pid_t) pid of the target server -#define PMIX_SERVER_HOSTNAME "pmix.srvr.host" // (char*) node where target server is located #define PMIX_SERVER_TMPDIR "pmix.srvr.tmpdir" // (char*) temp directory where PMIx server will place // client rendezvous points and contact info #define PMIX_SYSTEM_TMPDIR "pmix.sys.tmpdir" // (char*) temp directory for this system, where PMIx // server will place tool rendezvous points and contact info -#define PMIX_CONNECT_TO_SYSTEM "pmix.cnct.sys" // (bool) The requestor requires that a connection be made only to - // a local system-level PMIx server -#define PMIX_CONNECT_SYSTEM_FIRST "pmix.cnct.sys.first" // (bool) Preferentially look for a system-level PMIx server first -#define PMIX_REGISTER_NODATA "pmix.reg.nodata" // (bool) Registration is for nspace only, do not copy job data #define PMIX_SERVER_ENABLE_MONITORING "pmix.srv.monitor" // (bool) Enable PMIx internal monitoring by server #define PMIX_SERVER_NSPACE "pmix.srv.nspace" // (char*) Name of the nspace to use for this server #define PMIX_SERVER_RANK "pmix.srv.rank" // (pmix_rank_t) Rank of this server -#define PMIX_TOOL_NSPACE "pmix.tool.nspace" // (char*) Name of the nspace to use for this tool -#define PMIX_TOOL_RANK "pmix.tool.rank" // (uint32_t) Rank of this tool + + +/* tool-related attributes */ +#define PMIX_SERVER_PIDINFO "pmix.srvr.pidinfo" // (pid_t) pid of the target server for a tool +#define PMIX_CONNECT_TO_SYSTEM "pmix.cnct.sys" // (bool) The requestor requires that a connection be made only to + // a local system-level PMIx server +#define PMIX_CONNECT_SYSTEM_FIRST "pmix.cnct.sys.first" // (bool) Preferentially look for a system-level PMIx server first +#define PMIX_SERVER_URI "pmix.srvr.uri" // (char*) URI of server to be contacted +#define PMIX_SERVER_HOSTNAME "pmix.srvr.host" // (char*) node where target server is located +#define PMIX_CONNECT_MAX_RETRIES "pmix.tool.mretries" // (uint32_t) maximum number of times to try to connect to server +#define PMIX_CONNECT_RETRY_DELAY "pmix.tool.retry" // (uint32_t) time in seconds between connection attempts /* identification attributes */ @@ -254,6 +257,7 @@ typedef uint32_t pmix_rank_t; /* attributes used by host server to pass data to the server convenience library - the * data will then be parsed and provided to the local clients */ +#define PMIX_REGISTER_NODATA "pmix.reg.nodata" // (bool) Registration is for nspace only, do not copy job data #define PMIX_PROC_DATA "pmix.pdata" // (pmix_data_array_t) starts with rank, then contains more data #define PMIX_NODE_MAP "pmix.nmap" // (char*) regex of nodes containing procs for this job #define PMIX_PROC_MAP "pmix.pmap" // (char*) regex describing procs on each node within this job diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/arm/timer.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/arm/timer.h index 65532ac8a7..fd280cc221 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/arm/timer.h +++ b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/arm/timer.h @@ -2,7 +2,6 @@ * Copyright (c) 2008 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/arm64/timer.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/arm64/timer.h index bacc4b919e..b6bfe2abd6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/arm64/timer.h +++ b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/arm64/timer.h @@ -6,7 +6,6 @@ * Copyright (c) 2016 Broadcom Limited. All rights reserved. * Copyright (c) 2016 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/atomic_impl.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/atomic_impl.h index 62213e3a50..e1fb810f78 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/atomic_impl.h +++ b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/atomic_impl.h @@ -13,7 +13,6 @@ * Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/ia32/timer.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/ia32/timer.h index 5be92d4902..9f9a80d684 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/ia32/timer.h +++ b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/ia32/timer.h @@ -9,7 +9,6 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/ia64/timer.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/ia64/timer.h index 5a33236592..65a9bef316 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/ia64/timer.h +++ b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/ia64/timer.h @@ -9,7 +9,6 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/mips/timer.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/mips/timer.h index 65532ac8a7..fd280cc221 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/mips/timer.h +++ b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/mips/timer.h @@ -2,7 +2,6 @@ * Copyright (c) 2008 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/powerpc/timer.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/powerpc/timer.h index dd8c3ffe1b..0d557e875e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/powerpc/timer.h +++ b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/powerpc/timer.h @@ -9,7 +9,6 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/sparcv9/timer.h b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/sparcv9/timer.h index 395ea98601..354babad46 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/sparcv9/timer.h +++ b/opal/mca/pmix/pmix2x/pmix/src/atomics/sys/sparcv9/timer.h @@ -9,7 +9,6 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/class/Makefile.include index 80eb146f91..904995173d 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/class/Makefile.include @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c index 7dc218e22f..ead33aecfa 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * 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$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.c index ea0eb96c2b..933c5bcd5a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.c +++ b/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. * 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$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c index 6dffa57139..ad8661281b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c @@ -39,7 +39,7 @@ * special, since be mark it as already initialized, with no parent * and no constructor or destructor. */ -pmix_class_t pmix_object_t_class = { +PMIX_EXPORT pmix_class_t pmix_object_t_class = { "pmix_object_t", /* name */ NULL, /* parent class */ NULL, /* constructor */ diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_ring_buffer.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_ring_buffer.c index ce54f62d29..e578a4e22b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_ring_buffer.c +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_ring_buffer.c @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_ring_buffer.h b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_ring_buffer.h index 47e51088af..8e8d236bd6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_ring_buffer.h +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_ring_buffer.h @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c index 31c19c15c4..166759beee 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.c b/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.c index 61fb73a637..2e8977176c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.c +++ b/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.c @@ -198,7 +198,7 @@ static pmix_status_t unpack_return(pmix_buffer_t *data) } pmix_output_verbose(2, pmix_globals.debug_output, "client:unpack fence received status %d", ret); - return PMIX_SUCCESS; + return ret; } static pmix_status_t pack_fence(pmix_buffer_t *msg, pmix_cmd_t cmd, diff --git a/opal/mca/pmix/pmix2x/pmix/src/event/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/event/Makefile.include index 78ceaa4e30..2f970896a4 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/event/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/event/Makefile.include @@ -1,6 +1,6 @@ # -*- makefile -*- # -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/align.h b/opal/mca/pmix/pmix2x/pmix/src/include/align.h index 77658918f0..e55c303603 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/align.h +++ b/opal/mca/pmix/pmix2x/pmix/src/include/align.h @@ -12,7 +12,6 @@ * Copyright (c) 2006 Voltaire All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/hash_string.h b/opal/mca/pmix/pmix2x/pmix/src/include/hash_string.h index a3ba48e1f2..a079f793ca 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/hash_string.h +++ b/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 * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_config_top.h b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_config_top.h index d157391077..725a6c7c36 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_config_top.h +++ b/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) 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$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h index aeb9d2e007..2b7ecb506c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h +++ b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/mca/Makefile.include index fe943ad61f..67f92a9207 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/Makefile.include @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/base/Makefile.am index 3e27f92ad0..948d687eed 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/Makefile.am +++ b/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. # All rights reserved. # Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/base.h b/opal/mca/pmix/pmix2x/pmix/src/mca/base/base.h index d70dc33e34..0554431d7b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/base.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/base.h @@ -15,7 +15,7 @@ * reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-base.txt b/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-base.txt index c12f28df5a..c0b8251076 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-base.txt +++ b/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. # All rights reserved. # Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-var.txt b/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-var.txt index 886e73f588..b306c31ff9 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-var.txt +++ b/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) 2013 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_close.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_close.c index 4b028ad536..f42c2f038f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_close.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_close.c @@ -13,7 +13,7 @@ * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c index 8f1fed5e56..78ae2781a9 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_find.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_find.c index 9fb63381be..981511ee5a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_find.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_find.c @@ -16,7 +16,7 @@ * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_repository.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_repository.c index 9de9f8f424..ccf730e698 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_repository.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_repository.c @@ -212,6 +212,7 @@ int pmix_mca_base_component_repository_add (const char *path) return PMIX_SUCCESS; } + /* * Initialize the repository */ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_repository.h b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_repository.h index 23978bea0b..38d6f464db 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_repository.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_repository.h @@ -13,7 +13,7 @@ * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_close.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_close.c index a8ae7b2c56..22d757a0ae 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_close.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_close.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_open.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_open.c index dbde228e56..63aa9f1997 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_open.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_open.c @@ -14,7 +14,7 @@ * Copyright (c) 2011-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2014 Hochschule Esslingen. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_register.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_register.c index be73c59116..fc53b411cd 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_register.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_register.c @@ -13,7 +13,7 @@ * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011-2015 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_select.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_select.c index 805305941c..b039bf66c2 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_select.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_components_select.c @@ -5,7 +5,7 @@ * Corporation. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_framework.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_framework.c index 2097a25db2..3e0ddfa57e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_framework.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_framework.c @@ -3,7 +3,7 @@ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_list.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_list.c index b16fde371b..1d5f8b6fcd 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_list.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_list.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_parse_paramfile.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_parse_paramfile.c index 4504f48f2c..12785f22d5 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_parse_paramfile.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_parse_paramfile.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_enum.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_enum.c index ab674cc0f8..b5bb281b68 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_enum.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_enum.c @@ -13,7 +13,7 @@ * Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_enum.h b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_enum.h index bbf93c4831..fbe0bcaee4 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_enum.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_enum.h @@ -13,7 +13,7 @@ * Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2016 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_group.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_group.c index beda836b36..8cef65e83c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_group.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_group.c @@ -13,7 +13,7 @@ * Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_group.h b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_group.h index 1be058d05b..bd43c7840a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_group.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_var_group.h @@ -13,7 +13,7 @@ * Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_vari.h b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_vari.h index 8170d6d184..e2bd97b1e2 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_vari.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_vari.h @@ -13,7 +13,7 @@ * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c b/opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c index 62166d7df5..1144f196e1 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c @@ -2275,7 +2275,7 @@ static pmix_status_t _dstore_fetch(const char *nspace, pmix_rank_t rank, pmix_status_t rc = PMIX_ERROR, lock_rc; ns_track_elem_t *elem; rank_meta_info *rinfo = NULL; - size_t kval_cnt; + size_t kval_cnt = 0; seg_desc_t *meta_seg, *data_seg; uint8_t *addr; pmix_buffer_t buffer; @@ -2558,7 +2558,9 @@ done: if( NULL != info ) { PMIX_INFO_FREE(info, ninfo); } - PMIX_VALUE_RELEASE(kval); + if (NULL != kval) { + PMIX_VALUE_RELEASE(kval); + } } return rc; } diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/mca.h b/opal/mca/pmix/pmix2x/pmix/src/mca/mca.h index 2ce93659bf..5970a10eb8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/mca.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/mca.h @@ -13,7 +13,7 @@ * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am index 6218f318b6..fdd56a8e2e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am @@ -3,7 +3,6 @@ # University Research and Technology # Corporation. All rights reserved. # Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/Makefile.am index 432c401103..efc770a274 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/Makefile.am +++ b/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) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/base.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/base.h index db39debf5d..2cb3725688 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/base.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/base.h @@ -3,7 +3,7 @@ * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_close.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_close.c index eeb4eab952..7c6f5456a4 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_close.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_close.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2010 The Trustees of Indiana University. * All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_fns.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_fns.c index 5d240c0e7f..091715dadc 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_fns.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_fns.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2010 The Trustees of Indiana University. * All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_open.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_open.c index ddf2cd51b9..22b6cd4c47 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_open.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_open.c @@ -4,7 +4,7 @@ * Copyright (c) 2011-2013 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c index dde3b755d7..e42db673be 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c @@ -4,7 +4,6 @@ * All rights reserved. * * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h index 950e4f33c0..e34ac5bd6b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h +++ b/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 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am index fce6a5e14e..c2811eecd8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am @@ -2,7 +2,6 @@ # Copyright (c) 2004-2010 The Trustees of Indiana University. # All rights reserved. # Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen.h index 101f457b96..7ba3e24760 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_component.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_component.c index 5bee2fd73c..8e061d5ca9 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_component.c +++ b/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 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/Makefile.am index fc206e0fb8..f444a5ca9b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/Makefile.am +++ b/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) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/Makefile.am index 797be986a9..7bd00a4b3f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/Makefile.am @@ -1,6 +1,6 @@ # # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/base.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/base.h index 33568a2546..e219a065c6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/base.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/base.h @@ -1,6 +1,6 @@ /* * 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$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/pif_base_components.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/pif_base_components.c index 982a607520..803e45c2a0 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/pif_base_components.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/base/pif_base_components.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2010-2013 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-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/Makefile.am index f2a4afad67..fcc8f2bab9 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/Makefile.am @@ -1,6 +1,6 @@ # # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/configure.m4 index adf1bd7f6d..6142c8032c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/configure.m4 @@ -3,7 +3,7 @@ # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c index 399147d81e..9157d54661 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c +++ b/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 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/Makefile.am index 92871d285d..8772eb3868 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/Makefile.am @@ -1,6 +1,6 @@ # # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/configure.m4 index caa792092f..22333fc258 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/configure.m4 @@ -3,7 +3,7 @@ # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c index d09ecc78f1..2dac2550d3 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c +++ b/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 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/Makefile.am index be3460a51e..9bba51baeb 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/Makefile.am @@ -1,6 +1,6 @@ # # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/configure.m4 index e540d76b72..e09ba899fc 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/configure.m4 @@ -3,7 +3,7 @@ # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/pif_linux_ipv6.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/pif_linux_ipv6.c index b7e601d24e..2f240f9d8a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/pif_linux_ipv6.c +++ b/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 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/pif.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/pif.h index d1a2dee03e..29c75b869c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/pif.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/pif.h @@ -3,7 +3,7 @@ * Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/Makefile.am index 316795d8a6..e8f8fd5f7b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/Makefile.am @@ -1,6 +1,6 @@ # # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/configure.m4 index 3bba3fdcf2..729c97d603 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/configure.m4 @@ -3,7 +3,7 @@ # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/pif_posix.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/pif_posix.c index f8c075b84d..3c2e4603a6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/pif_posix.c +++ b/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 * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/Makefile.am index 5c3ec5986f..9d62d2d7d7 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/Makefile.am @@ -1,6 +1,6 @@ # # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/configure.m4 index 748a30e129..df109d516d 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/configure.m4 @@ -1,7 +1,7 @@ # -*- shell-script -*- # # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c index 2d1688af03..7403cebf0e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/solaris_ipv6/pif_solaris_ipv6.c @@ -3,7 +3,7 @@ * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/Makefile.am index da5e305a55..deaa8fe667 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/Makefile.am @@ -2,7 +2,7 @@ # Copyright (c) 2006 Los Alamos National Security, LLC. 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/Makefile.am index 8b7d5164a7..1617f5688c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/Makefile.am +++ b/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 # reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/base.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/base.h index 99ac117725..a7592f0927 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/base.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/base.h @@ -3,7 +3,7 @@ * reserved. * Copyright (c) 2007-2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Sandia National Laboratories. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/pinstalldirs_base_components.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/pinstalldirs_base_components.c index 61d1c0b553..5a8902886e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/pinstalldirs_base_components.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/pinstalldirs_base_components.c @@ -5,7 +5,7 @@ * Copyright (c) 2010 Sandia National Laboratories. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/pinstalldirs_base_expand.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/pinstalldirs_base_expand.c index fd4b680d54..d52822d2d5 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/pinstalldirs_base_expand.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/pinstalldirs_base_expand.c @@ -4,7 +4,7 @@ * Copyright (c) 2007-2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007 Sun Microsystem, Inc. All rights reserved. * Copyright (c) 2010 Sandia National Laboratories. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/Makefile.am index 518453a576..d05743fb5f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/Makefile.am @@ -4,7 +4,7 @@ # Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009 High Performance Computing Center Stuttgart, # University of Stuttgart. All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/configure.m4 index a73172e07a..c057b438d0 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/configure.m4 +++ b/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 # 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 # and Technology (RIST). All rights reserved. # $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h.in b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h.in index 22dd8bd4a5..e1569ae73a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h.in +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h.in @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2007 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pmix_pinstalldirs_config.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pmix_pinstalldirs_config.c index 1d087e5997..f48de36bd8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pmix_pinstalldirs_config.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pmix_pinstalldirs_config.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/configure.m4 index b2bed9ff37..08217bd349 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/configure.m4 @@ -1,7 +1,7 @@ dnl -*- shell-script -*- dnl dnl Copyright (c) 2006-2010 Sandia National Laboratories. 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 dnl Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am index 26ff104d7a..61471d1392 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am @@ -3,7 +3,6 @@ # reserved. # Copyright (c) 2009 High Performance Computing Center Stuttgart, # University of Stuttgart. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/configure.m4 index 90916d196e..47e18c3c51 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/configure.m4 +++ b/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 # 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 # and Technology (RIST). All rights reserved. # $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/pmix_pinstalldirs_env.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/pmix_pinstalldirs_env.c index 2f43925f45..9ee499b079 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/pmix_pinstalldirs_env.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/pmix_pinstalldirs_env.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/Makefile.am index 170fe2f772..9a078f0244 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/Makefile.am +++ b/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. # 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$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/Makefile.include index 13b086fcdf..a45c86fd0b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/Makefile.include +++ b/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. # 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$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_fns.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_fns.c index d868700414..3572fdf8e8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_fns.c +++ b/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 -*- */ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. * diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_frame.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_frame.c index a3ebb31ae0..0dd5410dae 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_frame.c +++ b/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. * 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 * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c index cfa32bcbe5..f751146948 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/Makefile.am index 1d140e020b..1223b43eca 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/Makefile.am +++ b/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. # 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) 2017 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4 index 97344fa373..4d6d109a9d 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4 @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h index 4d777c46a1..278c894863 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h +++ b/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$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_component.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_component.c index ef7e180215..7d07c400f6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_component.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_component.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h index 7a28f5d3dd..dedb1eb63f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * 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 * and Technology (RIST). All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/Makefile.am index dc10f4a08c..ce2cdabab6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/Makefile.include index 84e9517d5d..ac0e6009c6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/Makefile.include @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/Makefile.am index bcf860ec33..a756c8b19d 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/configure.m4 index 26a93ce5a6..503bc34f06 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/configure.m4 @@ -1,6 +1,6 @@ # -*- shell-script -*- # -# 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 # and Technology (RIST). All rights reserved. # $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/psec_munge.h b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/psec_munge.h index 76d02d73ff..ff50bd4918 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/psec_munge.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/psec_munge.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/psec_munge_component.c b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/psec_munge_component.c index 9204f8ef3b..c44a5232d0 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/psec_munge_component.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/munge/psec_munge_component.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/Makefile.am index 18e7dc18c8..9381d8ad60 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/psec_native.h b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/psec_native.h index 20c63fdd50..8adf0f8b11 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/psec_native.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/psec_native.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/psec_native_component.c b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/psec_native_component.c index 037c40299c..b392fe201f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/psec_native_component.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/native/psec_native_component.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/Makefile.am index 46a6efc588..7423699637 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/psec_none.h b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/psec_none.h index 16d199cdcf..d443c97448 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/psec_none.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/psec_none.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/psec_none_component.c b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/psec_none_component.c index 0b254eaa13..17e9035b3a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/psec_none_component.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/none/psec_none_component.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pshmem/mmap/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pshmem/mmap/Makefile.am index 52109f28d2..68ba424b71 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pshmem/mmap/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pshmem/mmap/Makefile.am @@ -2,7 +2,6 @@ # # Copyright (c) 2017 Mellanox Technologies, Inc. # All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/Makefile.am index 7481f0f73f..dcc0b2691b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/base/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/base/Makefile.include index 2c22f16a2f..ef5342171a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/base/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/base/Makefile.include @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/base/ptl_base_connect.c b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/base/ptl_base_connect.c index aeaa9bc3bb..f66d61e641 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/base/ptl_base_connect.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/base/ptl_base_connect.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/Makefile.am index 12f4988c21..6788aba19c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.c b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.c index a72dcf2d0d..0640afccb9 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.c @@ -42,6 +42,7 @@ #ifdef HAVE_SYS_STAT_H #include #endif +#include #include "src/include/pmix_globals.h" #include "src/include/pmix_socket_errno.h" @@ -102,19 +103,29 @@ static char *pmix_getline(FILE *fp) return NULL; } +static pmix_status_t parse_uri_file(char *filename, + char **uri, + char **nspace, + pmix_rank_t *rank); +static pmix_status_t try_connect(int *sd); +static pmix_status_t df_search(char *dirname, char *prefix, + int *sd, char **nspace, + pmix_rank_t *rank); + static pmix_status_t connect_to_peer(struct pmix_peer_t *peer, pmix_info_t *info, size_t ninfo) { - char *evar, **uri; - char *filename, *host; - FILE *fp; - char *srvr, *p, *p2; - struct sockaddr_in *in; - struct sockaddr_in6 *in6; - pmix_socklen_t len; + char *evar, **uri, *suri; + char *filename, *nspace=NULL; + pmix_rank_t rank = PMIX_RANK_WILDCARD; + char *p, *p2; int sd, rc; + size_t n; + char myhost[PMIX_MAXHOSTNAMELEN]; + bool system_level = false; + bool system_level_only = false; - pmix_output_verbose(2, pmix_globals.debug_output, + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, "ptl:tcp: connecting to server"); /* see if the connection info is in the info array - if @@ -149,21 +160,8 @@ static pmix_status_t connect_to_peer(struct pmix_peer_t *peer, } *p2 = '\0'; ++p2; - if (NULL == pmix_client_globals.myserver->info) { - pmix_client_globals.myserver->info = PMIX_NEW(pmix_rank_info_t); - } - if (NULL == pmix_client_globals.myserver->nptr) { - pmix_client_globals.myserver->nptr = PMIX_NEW(pmix_nspace_t); - } - if (NULL == pmix_client_globals.myserver->nptr->nspace) { - pmix_client_globals.myserver->nptr->nspace = strdup(p); - } - if (NULL == pmix_client_globals.myserver->info->pname.nspace) { - pmix_client_globals.myserver->info->pname.nspace = strdup(p); - } - - /* set the server rank */ - pmix_client_globals.myserver->info->pname.rank = strtoull(p2, NULL, 10); + nspace = strdup(p); + rank = strtoull(p2, NULL, 10); /* save the URI, but do not overwrite what we may have received from * the info-key directives */ @@ -172,158 +170,178 @@ static pmix_status_t connect_to_peer(struct pmix_peer_t *peer, } pmix_argv_free(uri); - } else if (PMIX_PROC_IS_TOOL) { - /* if we already have a URI, then look no further */ - if (NULL == mca_ptl_tcp_component.super.uri) { - /* we have to discover the connection info, - * if possible. Start by looking for the connection - * info in the expected place - if the server supports - * tool connections via TCP, then there will be a - * "contact.txt" file under the system tmpdir */ - filename = pmix_os_path(false, mca_ptl_tcp_component.tmpdir, "pmix-contact.txt", NULL); - if (NULL == filename) { - return PMIX_ERR_NOMEM; - } - fp = fopen(filename, "r"); - if (NULL == fp) { - /* if we cannot open the file, then the server must not - * be configured to support tool connections - so abort */ - free(filename); - return PMIX_ERR_UNREACH; - } - free(filename); - /* get the URI */ - srvr = pmix_getline(fp); - if (NULL == srvr) { - PMIX_ERROR_LOG(PMIX_ERR_FILE_READ_FAILURE); - fclose(fp); - return PMIX_ERR_UNREACH; - } - fclose(fp); - /* up to the first ';' is the server nspace/rank */ - if (NULL == (p = strchr(srvr, ';'))) { - /* malformed */ - free(srvr); - return PMIX_ERR_UNREACH; - } - *p = '\0'; - ++p; // move past the semicolon - /* the nspace is the section up to the '.' */ - if (NULL == (p2 = strchr(srvr, '.'))) { - /* malformed */ - free(srvr); - return PMIX_ERR_UNREACH; - } - *p2 = '\0'; - ++p2; - /* set the server nspace */ - if (NULL == pmix_client_globals.myserver->info) { - pmix_client_globals.myserver->info = PMIX_NEW(pmix_rank_info_t); - } - if (NULL == pmix_client_globals.myserver->nptr) { - pmix_client_globals.myserver->nptr = PMIX_NEW(pmix_nspace_t); - } - if (NULL == pmix_client_globals.myserver->nptr->nspace) { - pmix_client_globals.myserver->nptr->nspace = strdup(p); - } - if (NULL == pmix_client_globals.myserver->info->pname.nspace) { - pmix_client_globals.myserver->info->pname.nspace = strdup(p); - } - pmix_client_globals.myserver->info->pname.rank = strtoull(p2, NULL, 10); - /* now parse the uri itself */ - mca_ptl_tcp_component.super.uri = strdup(p); - free(srvr); + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "ptl:tcp:client attempt connect to %s", + mca_ptl_tcp_component.super.uri); + + /* go ahead and try to connect */ + if (PMIX_SUCCESS != (rc = try_connect(&sd))) { + free(nspace); + return rc; } + goto complete; + } - /* mark that we are the active module for this server */ - pmix_client_globals.myserver->nptr->compat.ptl = &pmix_ptl_tcp_module; + /* get here if we are a tool - check any provided directives + * to see where they want us to connect to */ + if (NULL != info) { + for (n=0; n < ninfo; n++) { + if (0 == strcmp(info[n].key, PMIX_CONNECT_TO_SYSTEM)) { + system_level_only = true; + } else if (0 == strcmp(info[n].key, PMIX_CONNECT_SYSTEM_FIRST)) { + /* try the system-level */ + system_level = true; + } else if (0 == strcmp(info[n].key, PMIX_SERVER_PIDINFO)) { + mca_ptl_tcp_component.tool_pid = info[n].value.data.pid; + } else if (0 == strcmp(info[n].key, PMIX_SERVER_URI)) { + if (NULL == mca_ptl_tcp_component.super.uri) { + free(mca_ptl_tcp_component.super.uri); + } + mca_ptl_tcp_component.super.uri = strdup(info[n].value.data.string); + } + } + } + gethostname(myhost, sizeof(myhost)); + /* if we were given a URI via MCA param, then look no further */ + if (NULL != mca_ptl_tcp_component.super.uri) { + /* if the string starts with "file:", then they are pointing + * us to a file we need to read to get the URI itself */ + if (0 != strncmp(mca_ptl_tcp_component.super.uri, "file:", 5)) { + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "ptl:tcp:tool getting connection info from %s", + mca_ptl_tcp_component.super.uri); + nspace = NULL; + rc = parse_uri_file(&mca_ptl_tcp_component.super.uri[6], &suri, &nspace, &rank); + if (PMIX_SUCCESS != rc) { + return PMIX_ERR_UNREACH; + } + free(mca_ptl_tcp_component.super.uri); + mca_ptl_tcp_component.super.uri = suri; + } + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "ptl:tcp:tool attempt connect using given URI %s", + mca_ptl_tcp_component.super.uri); + /* go ahead and try to connect */ + if (PMIX_SUCCESS != (rc = try_connect(&sd))) { + if (NULL != nspace) { + free(nspace); + } + return rc; + } + goto complete; + } - /* setup the path to the daemon rendezvous point */ - memset(&mca_ptl_tcp_component.connection, 0, sizeof(struct sockaddr_storage)); - if (0 == strncmp(mca_ptl_tcp_component.super.uri, "tcp4", 4)) { - /* separate the IP address from the port */ - p = strdup(mca_ptl_tcp_component.super.uri); - if (NULL == p) { + + /* 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)) { return PMIX_ERR_NOMEM; } - p2 = strchr(&p[7], ':'); - if (NULL == p2) { - free(p); - return PMIX_ERR_BAD_PARAM; + 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) { + mca_ptl_tcp_component.super.uri = suri; + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "ptl:tcp:tool attempt connect to system server at %s", + mca_ptl_tcp_component.super.uri); + /* go ahead and try to connect */ + if (PMIX_SUCCESS == try_connect(&sd)) { + goto complete; + } + free(nspace); } - *p2 = '\0'; - ++p2; - host = &p[7]; - /* load the address */ - in = (struct sockaddr_in*)&mca_ptl_tcp_component.connection; - in->sin_family = AF_INET; - in->sin_addr.s_addr = inet_addr(host); - if (in->sin_addr.s_addr == INADDR_NONE) { - free(p); - return PMIX_ERR_BAD_PARAM; - } - in->sin_port = htons(atoi(p2)); - len = sizeof(struct sockaddr_in); - } else { - /* separate the IP address from the port */ - p = strdup(mca_ptl_tcp_component.super.uri); - if (NULL == p) { + } + + /* 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"); + return PMIX_ERR_UNREACH; + } + + /* now try the session-level connection - if they gave us a pid, then + * look for it */ + if (0 != mca_ptl_tcp_component.tool_pid) { + if (0 > asprintf(&filename, "pmix.%s.tool.%d", + myhost, mca_ptl_tcp_component.tool_pid)) { return PMIX_ERR_NOMEM; } - p2 = strchr(&p[7], ':'); - if (NULL == p2) { - free(p); - return PMIX_ERR_BAD_PARAM; + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "ptl:tcp:tool searching for given session server %s", + filename); + nspace = NULL; + rc = df_search(mca_ptl_tcp_component.system_tmpdir, + filename, &sd, &nspace, &rank); + free(filename); + if (PMIX_SUCCESS == rc) { + goto complete; } - *p2 = '\0'; - if (']' == p[strlen(p)-1]) { - p[strlen(p)-1] = '\0'; + if (NULL != nspace) { + free(nspace); } - if ('[' == p[7]) { - host = &p[8]; - } else { - host = &p[7]; - } - /* load the address */ - in6 = (struct sockaddr_in6*)&mca_ptl_tcp_component.connection; - in6->sin6_family = AF_INET6; - if (0 == inet_pton(AF_INET6, host, (void*)&in6->sin6_addr)) { - pmix_output (0, "ptl_tcp_parse_uri: Could not convert %s\n", host); - free(p); - return PMIX_ERR_BAD_PARAM; - } - in6->sin6_port = htons(atoi(p2)); - len = sizeof(struct sockaddr_in6); - } - free(p); - - /* establish the connection */ - if (PMIX_SUCCESS != (rc = pmix_ptl_base_connect(&mca_ptl_tcp_component.connection, len, &sd))) { - PMIX_ERROR_LOG(rc); - return rc; - } - pmix_client_globals.myserver->sd = sd; - - /* send our identity and any authentication credentials to the server */ - if (PMIX_SUCCESS != (rc = send_connect_ack(sd))) { - PMIX_ERROR_LOG(rc); - CLOSE_THE_SOCKET(sd); - return rc; + /* since they gave us a specific pid and we couldn't + * connect to it, return an error */ + return PMIX_ERR_UNREACH; } - /* do whatever handshake is required */ - if (PMIX_SUCCESS != (rc = recv_connect_ack(sd))) { - PMIX_ERROR_LOG(rc); - CLOSE_THE_SOCKET(sd); - return rc; + /* 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 + * that succeeds - this is based on the likelihood that there is only + * one session per user on a node */ + + if (0 > asprintf(&filename, "pmix.%s.tool", myhost)) { + return PMIX_ERR_NOMEM; + } + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "ptl:tcp:tool searching for session server %s", + filename); + nspace = NULL; + rc = df_search(mca_ptl_tcp_component.system_tmpdir, + filename, &sd, &nspace, &rank); + free(filename); + if (PMIX_SUCCESS != rc) { + if (NULL != nspace){ + free(nspace); + } + return PMIX_ERR_UNREACH; } + complete: pmix_output_verbose(2, pmix_globals.debug_output, "sock_peer_try_connect: Connection across to server succeeded"); + /* do a final bozo check */ + if (NULL == nspace || PMIX_RANK_WILDCARD == rank) { + CLOSE_THE_SOCKET(sd); + return PMIX_ERR_UNREACH; + } /* mark the connection as made */ pmix_globals.connected = true; + pmix_client_globals.myserver->sd = sd; + + /* setup the server info */ + if (NULL == pmix_client_globals.myserver->info) { + pmix_client_globals.myserver->info = PMIX_NEW(pmix_rank_info_t); + } + if (NULL == pmix_client_globals.myserver->nptr) { + pmix_client_globals.myserver->nptr = PMIX_NEW(pmix_nspace_t); + } + if (NULL == pmix_client_globals.myserver->nptr->nspace) { + pmix_client_globals.myserver->nptr->nspace = nspace; + } else { + free(nspace); + } + if (NULL == pmix_client_globals.myserver->info->pname.nspace) { + pmix_client_globals.myserver->info->pname.nspace = strdup(pmix_client_globals.myserver->nptr->nspace); + } + pmix_client_globals.myserver->info->pname.rank = rank; pmix_ptl_base_set_nonblocking(sd); @@ -356,7 +374,7 @@ static pmix_status_t send_recv(struct pmix_peer_t *peer, pmix_ptl_sr_t *ms; pmix_peer_t *pr = (pmix_peer_t*)peer; - pmix_output_verbose(5, pmix_globals.debug_output, + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, "[%s:%d] post send to server", __FILE__, __LINE__); @@ -391,6 +409,158 @@ static pmix_status_t send_oneway(struct pmix_peer_t *peer, /**** SUPPORTING FUNCTIONS ****/ +static pmix_status_t parse_uri_file(char *filename, + char **uri, + char **nspace, + pmix_rank_t *rank) +{ + FILE *fp; + char *srvr, *p, *p2; + + fp = fopen(filename, "r"); + if (NULL == fp) { + /* if we cannot open the file, then the server must not + * be configured to support tool connections, or this + * user isn't authorized to access it */ + return PMIX_ERR_UNREACH; + } + /* get the URI */ + srvr = pmix_getline(fp); + if (NULL == srvr) { + PMIX_ERROR_LOG(PMIX_ERR_FILE_READ_FAILURE); + fclose(fp); + return PMIX_ERR_UNREACH; + } + fclose(fp); + /* up to the first ';' is the server nspace/rank */ + if (NULL == (p = strchr(srvr, ';'))) { + /* malformed */ + free(srvr); + return PMIX_ERR_UNREACH; + } + *p = '\0'; + ++p; // move past the semicolon + /* the nspace is the section up to the '.' */ + if (NULL == (p2 = strchr(srvr, '.'))) { + /* malformed */ + free(srvr); + return PMIX_ERR_UNREACH; + } + *p2 = '\0'; + ++p2; + /* set the server nspace */ + *nspace = strdup(p); + *rank = strtoull(p2, NULL, 10); + + /* now parse the uri itself */ + *uri = strdup(p); + free(srvr); + + return PMIX_SUCCESS; +} + +static pmix_status_t try_connect(int *sd) +{ + char *p, *p2, *host; + struct sockaddr_in *in; + struct sockaddr_in6 *in6; + size_t len; + pmix_status_t rc; + + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "pmix:tcp try connect to %s", + mca_ptl_tcp_component.super.uri); + + /* mark that we are the active module for this server */ + pmix_client_globals.myserver->nptr->compat.ptl = &pmix_ptl_tcp_module; + + /* setup the path to the daemon rendezvous point */ + memset(&mca_ptl_tcp_component.connection, 0, sizeof(struct sockaddr_storage)); + if (0 == strncmp(mca_ptl_tcp_component.super.uri, "tcp4", 4)) { + /* separate the IP address from the port */ + p = strdup(mca_ptl_tcp_component.super.uri); + if (NULL == p) { + PMIX_ERROR_LOG(PMIX_ERR_NOMEM); + return PMIX_ERR_NOMEM; + } + p2 = strchr(&p[7], ':'); + if (NULL == p2) { + free(p); + PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM); + return PMIX_ERR_BAD_PARAM; + } + *p2 = '\0'; + ++p2; + host = &p[7]; + /* load the address */ + in = (struct sockaddr_in*)&mca_ptl_tcp_component.connection; + in->sin_family = AF_INET; + in->sin_addr.s_addr = inet_addr(host); + if (in->sin_addr.s_addr == INADDR_NONE) { + free(p); + PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM); + return PMIX_ERR_BAD_PARAM; + } + in->sin_port = htons(atoi(p2)); + len = sizeof(struct sockaddr_in); + } else { + /* separate the IP address from the port */ + p = strdup(mca_ptl_tcp_component.super.uri); + if (NULL == p) { + PMIX_ERROR_LOG(PMIX_ERR_NOMEM); + return PMIX_ERR_NOMEM; + } + p2 = strchr(&p[7], ':'); + if (NULL == p2) { + free(p); + PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM); + return PMIX_ERR_BAD_PARAM; + } + *p2 = '\0'; + if (']' == p[strlen(p)-1]) { + p[strlen(p)-1] = '\0'; + } + if ('[' == p[7]) { + host = &p[8]; + } else { + host = &p[7]; + } + /* load the address */ + in6 = (struct sockaddr_in6*)&mca_ptl_tcp_component.connection; + in6->sin6_family = AF_INET6; + if (0 == inet_pton(AF_INET6, host, (void*)&in6->sin6_addr)) { + pmix_output (0, "ptl_tcp_parse_uri: Could not convert %s\n", host); + free(p); + PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM); + return PMIX_ERR_BAD_PARAM; + } + in6->sin6_port = htons(atoi(p2)); + len = sizeof(struct sockaddr_in6); + } + free(p); + + /* establish the connection */ + if (PMIX_SUCCESS != (rc = pmix_ptl_base_connect(&mca_ptl_tcp_component.connection, len, sd))) { + PMIX_ERROR_LOG(rc); + return rc; + } + + /* send our identity and any authentication credentials to the server */ + if (PMIX_SUCCESS != (rc = send_connect_ack(*sd))) { + PMIX_ERROR_LOG(rc); + CLOSE_THE_SOCKET(*sd); + return rc; + } + + /* do whatever handshake is required */ + if (PMIX_SUCCESS != (rc = recv_connect_ack(*sd))) { + PMIX_ERROR_LOG(rc); + CLOSE_THE_SOCKET(*sd); + return rc; + } + + return PMIX_SUCCESS; +} static pmix_status_t send_connect_ack(int sd) { char *msg; @@ -405,7 +575,7 @@ static pmix_status_t send_connect_ack(int sd) gid_t egid; uint32_t u32; - pmix_output_verbose(2, pmix_globals.debug_output, + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, "pmix:tcp SEND CONNECT ACK"); /* if we are a server, then we shouldn't be here */ @@ -561,7 +731,7 @@ static pmix_status_t recv_connect_ack(int sd) uint32_t u32; char nspace[PMIX_MAX_NSLEN+1]; - pmix_output_verbose(2, pmix_globals.debug_output, + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, "pmix: RECV CONNECT ACK FROM SERVER"); /* get the current timeout value so we can reset to it */ @@ -577,7 +747,7 @@ static pmix_status_t recv_connect_ack(int sd) tv.tv_sec = 2; tv.tv_usec = 0; if (0 != setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv))) { - pmix_output_verbose(2, pmix_globals.debug_output, + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, "pmix: recv_connect_ack could not setsockopt SO_RCVTIMEO"); return PMIX_ERR_UNREACH; } @@ -601,7 +771,7 @@ static pmix_status_t recv_connect_ack(int sd) } else if (PMIX_SUCCESS != reply) { return reply; } - pmix_output_verbose(2, pmix_globals.debug_output, + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, "pmix: RECV CONNECT CONFIRMATION"); /* receive our index into the server's client array */ @@ -627,14 +797,24 @@ static pmix_status_t recv_connect_ack(int sd) pmix_globals.myid.rank = 0; /* get the server's nspace and rank so we can send to it */ - pmix_client_globals.myserver->info = PMIX_NEW(pmix_rank_info_t); - pmix_client_globals.myserver->nptr = PMIX_NEW(pmix_nspace_t); + if (NULL == pmix_client_globals.myserver->info) { + pmix_client_globals.myserver->info = PMIX_NEW(pmix_rank_info_t); + } + if (NULL == pmix_client_globals.myserver->nptr) { + pmix_client_globals.myserver->nptr = PMIX_NEW(pmix_nspace_t); + } pmix_ptl_base_recv_blocking(sd, (char*)nspace, PMIX_MAX_NSLEN+1); + if (NULL != pmix_client_globals.myserver->nptr->nspace) { + free(pmix_client_globals.myserver->nptr->nspace); + } pmix_client_globals.myserver->nptr->nspace = strdup(nspace); + if (NULL != pmix_client_globals.myserver->info->pname.nspace) { + free(pmix_client_globals.myserver->info->pname.nspace); + } pmix_client_globals.myserver->info->pname.nspace = strdup(nspace); pmix_ptl_base_recv_blocking(sd, (char*)&(pmix_client_globals.myserver->info->pname.rank), sizeof(int)); - pmix_output_verbose(2, pmix_globals.debug_output, + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, "pmix: RECV CONNECT CONFIRMATION FOR TOOL %s:%d FROM SERVER %s:%d", pmix_globals.myid.nspace, pmix_globals.myid.rank, pmix_client_globals.myserver->info->pname.nspace, @@ -665,129 +845,75 @@ static pmix_status_t recv_connect_ack(int sd) return PMIX_SUCCESS; } -#if 0 +static pmix_status_t df_search(char *dirname, char *prefix, + int *sd, char **nspace, + pmix_rank_t *rank) +{ + char *suri, *nsp, *newdir; + pmix_rank_t rk; + pmix_status_t rc; + DIR *cur_dirp; + struct dirent * dir_entry; -DIR *cur_dirp = NULL; -struct dirent * dir_entry; -bool connect_to_system_server = false; -bool connect_to_system_first = false; -bool connection_defined = false; - -/* scan incoming info for directives */ -if (NULL != info) { - for (n=0; n < ninfo; n++) { - if (strcmp(info[n].key, PMIX_SERVER_PIDINFO) == 0) { - server_pid = info[n].value.data.pid; - server_pid_given = true; - } else if (strcmp(info[n].key, PMIX_CONNECT_TO_SYSTEM) == 0) { - connect_to_system_server = info[n].value.data.flag; - connection_defined = true; - } else if (strcmp(info[n].key, PMIX_CONNECT_SYSTEM_FIRST) == 0) { - connect_to_system_first = info[n].value.data.flag; - connection_defined = true; - } else if (strcmp(info[n].key, PMIX_SERVER_TMPDIR) == 0 && - NULL == mytmpdir) { - mytmpdir = strdup(info[n].value.data.string); - } else if (strcmp(info[n].key, PMIX_SYSTEM_TMPDIR) == 0 && - NULL == systmpdir) { - systmpdir = strdup(info[n].value.data.string); - } + if (NULL == (cur_dirp = opendir(dirname))) { + return PMIX_ERR_NOT_FOUND; } -} + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "pmix:tcp: searching directory %s", dirname); - -/* if we are to connect solely to the system-level daemon, - * or to preferentially connect to the system-level daemon, - * or nothing was specified at all, then look to see if a - * rendezvous point in that location exists */ -if (connect_to_system_server || connect_to_system_first || !connection_defined) { - /* find the temp dir */ - if (NULL != systmpdir) { - tdir = systmpdir; - } else if (NULL == (tdir = getenv("TMPDIR"))) { - if (NULL == (tdir = getenv("TEMP"))) { - if (NULL == (tdir = getenv("TMP"))) { - tdir = "/tmp"; + /* search the entries for something that starts with the provided prefix */ + while (NULL != (dir_entry = readdir(cur_dirp))) { + /* ignore the . and .. entries */ + if (0 == strcmp(dir_entry->d_name, ".") || + 0 == strcmp(dir_entry->d_name, "..")) { + continue; + } + /* if it is a directory, down search */ + if (DT_DIR == dir_entry->d_type) { + newdir = pmix_os_path(false, dirname, dir_entry->d_name, NULL); + rc = df_search(newdir, prefix, sd, nspace, rank); + free(newdir); + if (PMIX_SUCCESS == rc) { + closedir(cur_dirp); + return rc; } + continue; } - } - snprintf(address.sun_path, sizeof(address.sun_path)-1, "%s/pmix.sys.%s", tdir, hostname); - /* see if the rendezvous file exists */ - if (0 != access(address.sun_path, R_OK)) { - /* if it was a requirement, then error out */ - if (connect_to_system_server) { - return PMIX_ERR_UNREACH; + /* if it isn't a regular file, ignore it */ + if (DT_REG != dir_entry->d_type) { + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "pmix:tcp: ignoring %s", dir_entry->d_name); + continue; } - /* otherwise, this isn't a fatal error - reset the addr */ - memset(&address, 0, sizeof(struct sockaddr_un)); - address.sun_family = AF_UNIX; - connection_defined = false; - } else { - /* connect to this server */ - connection_defined = true; - } -} - -if (!connection_defined) { - /* if we get here, then either we are to connect to - * a non-system daemon, or a system-level daemon was - * not found - so now look for the session daemon */ - - - /* find the temp dir */ - if (NULL != mytmpdir) { - tdir = mytmpdir; - } else if (NULL == (tdir = getenv("TMPDIR"))) { - if (NULL == (tdir = getenv("TEMP"))) { - if (NULL == (tdir = getenv("TMP"))) { - tdir = "/tmp"; - } - } - } - - /* if they gave us a specific pid, then look for that - * particular server - otherwise, see if there is only - * one on this node and default to it */ - if (server_pid_given) { - snprintf(address.sun_path, sizeof(address.sun_path)-1, "%s/pmix.%s.%d", tdir, hostname, server_pid); - /* if the rendezvous file doesn't exist, that's an error */ - if (0 != access(address.sun_path, R_OK)) { - return PMIX_ERR_NOT_FOUND; - } - } else { - /* open up the temp directory */ - if (NULL == (cur_dirp = opendir(tdir))) { - return PMIX_ERR_NOT_FOUND; - } - /* search the entries for something that starts with pmix.hostname */ - if (0 > asprintf(&tmp, "pmix.%s", hostname)) { - closedir(cur_dirp); - return PMIX_ERR_NOMEM; - } - evar = NULL; - while (NULL != (dir_entry = readdir(cur_dirp))) { - if (0 == strncmp(dir_entry->d_name, tmp, strlen(tmp))) { - /* found one - if more than one, then that's an error */ - if (NULL != evar) { - closedir(cur_dirp); - free(evar); - free(tmp); - return PMIX_ERR_INIT; + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "pmix:tcp: checking %s vs %s", dir_entry->d_name, prefix); + /* see if it starts with our prefix */ + if (0 == strncmp(dir_entry->d_name, prefix, strlen(prefix))) { + /* try to read this file */ + newdir = pmix_os_path(false, dirname, dir_entry->d_name, NULL); + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "pmix:tcp: reading file %s", newdir); + rc = parse_uri_file(newdir, &suri, &nsp, &rk); + free(newdir); + if (PMIX_SUCCESS == rc) { + if (NULL != mca_ptl_tcp_component.super.uri) { + free(mca_ptl_tcp_component.super.uri); } - evar = strdup(dir_entry->d_name); + mca_ptl_tcp_component.super.uri = suri; + /* go ahead and try to connect */ + pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, + "pmix:tcp: attempting to connect to %s", suri); + if (PMIX_SUCCESS == try_connect(sd)) { + (*nspace) = nsp; + *rank = rk; + closedir(cur_dirp); + return PMIX_SUCCESS; + } + free(nsp); } } - free(tmp); - closedir(cur_dirp); - if (NULL == evar) { - /* none found */ - return PMIX_ERR_INIT; - } - /* use the found one as our contact point */ - snprintf(address.sun_path, sizeof(address.sun_path)-1, "%s/%s", tdir, evar); - free(evar); } + closedir(cur_dirp); + return PMIX_ERR_NOT_FOUND; } - -#endif diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.h b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.h index 6d3b6f363d..60421fd82e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp.h @@ -36,7 +36,8 @@ BEGIN_C_DECLS typedef struct { pmix_ptl_base_component_t super; - char *tmpdir; + char *session_tmpdir; + char *system_tmpdir; char *if_include; char *if_exclude; int ipv4_port; @@ -44,7 +45,9 @@ typedef struct { bool disable_ipv4_family; bool disable_ipv6_family; struct sockaddr_storage connection; - char *filename; + char *session_filename; + char *system_filename; + pid_t tool_pid; } pmix_ptl_tcp_component_t; extern pmix_ptl_tcp_component_t mca_ptl_tcp_component; diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp_component.c b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp_component.c index 04268bbd34..e43cd6ce7f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp_component.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp_component.c @@ -13,6 +13,8 @@ * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2017 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,6 +37,9 @@ #ifdef HAVE_SYS_TYPES_H #include #endif +#ifdef HAVE_SYS_STAT_H +#include +#endif #include #ifdef HAVE_NETINET_IN_H #include @@ -98,14 +103,17 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo, .uri = NULL, .setup_listener = setup_listener }, - .tmpdir = NULL, + .session_tmpdir = NULL, + .system_tmpdir = NULL, .if_include = NULL, .if_exclude = NULL, .ipv4_port = 0, .ipv6_port = 0, .disable_ipv4_family = false, .disable_ipv6_family = true, - .filename = NULL + .session_filename = NULL, + .system_filename = NULL, + .tool_pid = 0 }; static char **split_and_resolve(char **orig_str, char *name); @@ -124,6 +132,13 @@ static int component_register(void) PMIX_MCA_BASE_VAR_SCOPE_LOCAL, &mca_ptl_tcp_component.super.uri); + (void)pmix_mca_base_component_var_register(component, "tool_pid", + "pid of a tool we are to connect to", + PMIX_MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + PMIX_INFO_LVL_2, + PMIX_MCA_BASE_VAR_SCOPE_LOCAL, + &mca_ptl_tcp_component.tool_pid); + (void)pmix_mca_base_component_var_register(component, "if_include", "Comma-delimited list of devices and/or CIDR notation of TCP networks (e.g., \"eth0,192.168.0.0/16\"). Mutually exclusive with ptl_tcp_if_exclude.", PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, @@ -188,19 +203,26 @@ static pmix_status_t component_open(void) /* check for environ-based directives * on system tmpdir to use */ - if (NULL == (tdir = getenv("PMIX_SERVER_TMPDIR"))) { - if (NULL == (tdir = getenv("PMIX_SYSTEM_TMPDIR"))) { - if (NULL == (tdir = getenv("TMPDIR"))) { - if (NULL == (tdir = getenv("TEMP"))) { - if (NULL == (tdir = getenv("TMP"))) { - tdir = "/tmp"; - } - } + if (NULL != (tdir = getenv("PMIX_SERVER_TMPDIR"))) { + mca_ptl_tcp_component.session_tmpdir = strdup(tdir); + } + + if (NULL != (tdir = getenv("PMIX_SYSTEM_TMPDIR"))) { + mca_ptl_tcp_component.system_tmpdir = strdup(tdir); + } + + if (NULL == (tdir = getenv("TMPDIR"))) { + if (NULL == (tdir = getenv("TEMP"))) { + if (NULL == (tdir = getenv("TMP"))) { + tdir = "/tmp"; } } } - if (NULL != tdir) { - mca_ptl_tcp_component.tmpdir = strdup(tdir); + if (NULL == mca_ptl_tcp_component.session_tmpdir) { + mca_ptl_tcp_component.session_tmpdir = strdup(tdir); + } + if (NULL == mca_ptl_tcp_component.system_tmpdir) { + mca_ptl_tcp_component.system_tmpdir = strdup(tdir); } return PMIX_SUCCESS; } @@ -208,9 +230,11 @@ static pmix_status_t component_open(void) pmix_status_t component_close(void) { - if (NULL != mca_ptl_tcp_component.filename) { - /* remove the file */ - unlink(mca_ptl_tcp_component.filename); + if (NULL != mca_ptl_tcp_component.system_filename) { + unlink(mca_ptl_tcp_component.system_filename); + } + if (NULL != mca_ptl_tcp_component.session_filename) { + unlink(mca_ptl_tcp_component.session_filename); } return PMIX_SUCCESS; } @@ -243,9 +267,11 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo, int kindex; size_t n; bool remote_connections = false; - bool tool_support = false; + bool session_tool = false; + bool system_tool = false; pmix_socklen_t addrlen; - char *prefix, myhost[NI_MAXHOST+1]; + char *prefix, myhost[PMIX_MAXHOSTNAMELEN]; + char myconnhost[PMIX_MAXHOSTNAMELEN]; int myport; pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, @@ -297,17 +323,28 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo, } mca_ptl_tcp_component.super.uri = strdup(info[n].value.data.string); } else if (0 == strcmp(info[n].key, PMIX_SERVER_TMPDIR)) { - if (NULL != mca_ptl_tcp_component.tmpdir) { - free(mca_ptl_tcp_component.tmpdir); + if (NULL != mca_ptl_tcp_component.session_tmpdir) { + free(mca_ptl_tcp_component.session_tmpdir); } - mca_ptl_tcp_component.tmpdir = strdup(info[n].value.data.string); + mca_ptl_tcp_component.session_tmpdir = strdup(info[n].value.data.string); + } else if (0 == strcmp(info[n].key, PMIX_SYSTEM_TMPDIR)) { + if (NULL != mca_ptl_tcp_component.system_tmpdir) { + free(mca_ptl_tcp_component.system_tmpdir); + } + mca_ptl_tcp_component.system_tmpdir = strdup(info[n].value.data.string); } else if (0 == strcmp(info[n].key, PMIX_SERVER_TOOL_SUPPORT)) { if (PMIX_UNDEF == info[n].value.type) { - tool_support = true; + session_tool = true; } else { - tool_support = info[n].value.data.flag; + session_tool = info[n].value.data.flag; } - } + } else if (0 == strcmp(info[n].key, PMIX_SERVER_SYSTEM_SUPPORT)) { + if (PMIX_UNDEF == info[n].value.type) { + system_tool = true; + } else { + system_tool = info[n].value.data.flag; + } + } } } @@ -507,21 +544,22 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo, goto sockerror; } + gethostname(myhost, sizeof(myhost)); if (AF_INET == mca_ptl_tcp_component.connection.ss_family) { prefix = "tcp4://"; myport = ntohs(((struct sockaddr_in*) &mca_ptl_tcp_component.connection)->sin_port); inet_ntop(AF_INET, &((struct sockaddr_in*) &mca_ptl_tcp_component.connection)->sin_addr, - myhost, NI_MAXHOST); + myconnhost, PMIX_MAXHOSTNAMELEN); } else if (AF_INET6 == mca_ptl_tcp_component.connection.ss_family) { prefix = "tcp6://"; myport = ntohs(((struct sockaddr_in6*) &mca_ptl_tcp_component.connection)->sin6_port); - inet_ntop(AF_INET6, &((struct sockaddr_in6*) &mca_ptl_tcp_component.connection)->sin6_addr, - myhost, NI_MAXHOST); + inet_ntop(AF_INET6, &((struct sockaddr_in6*) &mca_ptl_tcp_component.connection)->sin6_addr, + myconnhost, PMIX_MAXHOSTNAMELEN); } else { goto sockerror; } - asprintf(<->uri, "%s.%d;%s%s:%d", pmix_globals.myid.nspace, pmix_globals.myid.rank, prefix, myhost, myport); + asprintf(<->uri, "%s.%d;%s%s:%d", pmix_globals.myid.nspace, pmix_globals.myid.rank, prefix, myconnhost, myport); if (NULL == lt->uri) { CLOSE_THE_SOCKET(lt->socket); goto sockerror; @@ -529,28 +567,68 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo, pmix_output_verbose(2, pmix_ptl_base_framework.framework_output, "ptl:tcp URI %s", lt->uri); - /* if we are going to support tools, then drop the contact file */ - if (tool_support) { + /* if we are going to support tools, then drop contact file(s) */ + if (system_tool) { FILE *fp; - mca_ptl_tcp_component.filename = pmix_os_path(false, mca_ptl_tcp_component.tmpdir, "pmix-contact.txt", NULL); - if (NULL == mca_ptl_tcp_component.filename) { + if (0 > asprintf(&mca_ptl_tcp_component.system_filename, "%s/pmix.sys.%s", + mca_ptl_tcp_component.system_tmpdir, myhost)) { CLOSE_THE_SOCKET(lt->socket); goto sockerror; } - fp = fopen(mca_ptl_tcp_component.filename, "w"); + fp = fopen(mca_ptl_tcp_component.system_filename, "w"); if (NULL == fp) { - pmix_output( 0, "Impossible to open the file %s in write mode\n", mca_ptl_tcp_component.filename ); + pmix_output(0, "Impossible to open the file %s in write mode\n", mca_ptl_tcp_component.system_filename); PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE); CLOSE_THE_SOCKET(lt->socket); - free(mca_ptl_tcp_component.filename); - mca_ptl_tcp_component.filename = NULL; + free(mca_ptl_tcp_component.system_filename); + mca_ptl_tcp_component.system_filename = NULL; goto sockerror; } /* output my nspace and rank plus the URI */ fprintf(fp, "%s.%d:%s\n", pmix_globals.myid.nspace, pmix_globals.myid.rank, lt->uri); fclose(fp); + /* set the file mode */ + if (0 != chmod(mca_ptl_tcp_component.system_filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) { + PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE); + CLOSE_THE_SOCKET(lt->socket); + free(mca_ptl_tcp_component.system_filename); + mca_ptl_tcp_component.system_filename = NULL; + goto sockerror; + } + } + if (session_tool) { + FILE *fp; + pid_t mypid; + + mypid = getpid(); + if (0 > asprintf(&mca_ptl_tcp_component.session_filename, "%s/pmix.%s.tool.%d", + mca_ptl_tcp_component.session_tmpdir, myhost, mypid)) { + CLOSE_THE_SOCKET(lt->socket); + goto sockerror; + } + fp = fopen(mca_ptl_tcp_component.session_filename, "w"); + if (NULL == fp) { + pmix_output(0, "Impossible to open the file %s in write mode\n", mca_ptl_tcp_component.session_filename); + PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE); + CLOSE_THE_SOCKET(lt->socket); + free(mca_ptl_tcp_component.session_filename); + mca_ptl_tcp_component.session_filename = NULL; + goto sockerror; + } + + /* output my nspace and rank plus the URI */ + fprintf(fp, "%s.%d:%s\n", pmix_globals.myid.nspace, pmix_globals.myid.rank, lt->uri); + fclose(fp); + /* set the file mode */ + if (0 != chmod(mca_ptl_tcp_component.session_filename, S_IRUSR | S_IWUSR | S_IRGRP)) { + PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE); + CLOSE_THE_SOCKET(lt->socket); + free(mca_ptl_tcp_component.system_filename); + mca_ptl_tcp_component.system_filename = NULL; + goto sockerror; + } } /* we need listener thread support */ @@ -1011,15 +1089,14 @@ static void connection_handler(int sd, short args, void *cbdata) /* send an error reply to the client */ goto error; } - free(msg); /* and the buffer type to match */ peer->nptr->compat.type = bftype; /* set the gds module to match this peer */ PMIX_INFO_LOAD(&ginfo, PMIX_GDS_MODULE, gds, PMIX_STRING); + free(msg); // can now release the data buffer peer->nptr->compat.gds = pmix_gds_base_assign_module(&ginfo, 1); if (NULL == peer->nptr->compat.gds) { - free(msg); info->proc_cnt--; PMIX_RELEASE(info); pmix_pointer_array_set_item(&pmix_server_globals.clients, peer->index, NULL); @@ -1121,6 +1198,7 @@ static void process_cbfunc(int sd, short args, void *cbdata) pmix_rank_info_t *info; int rc; uint32_t u32; + pmix_info_t ginfo; /* acquire the object */ PMIX_ACQUIRE_OBJECT(cd); @@ -1172,7 +1250,7 @@ static void process_cbfunc(int sd, short args, void *cbdata) /* add this nspace to our pool */ nptr = PMIX_NEW(pmix_nspace_t); - (void)strncpy(nptr->nspace, cd->proc.nspace, PMIX_MAX_NSLEN); + nptr->nspace = strdup(cd->proc.nspace); pmix_list_append(&pmix_server_globals.nspaces, &nptr->super); /* add this tool rank to the nspace */ info = PMIX_NEW(pmix_rank_info_t); @@ -1206,6 +1284,27 @@ static void process_cbfunc(int sd, short args, void *cbdata) * tool as we received this request via that channel, so simply * record it here for future use */ peer->nptr->compat.ptl = &pmix_ptl_tcp_module; + /* select their bfrops compat module */ + peer->nptr->compat.bfrops = pmix_bfrops_base_assign_module(pnd->bfrops); + if (NULL == peer->nptr->compat.bfrops) { + PMIX_RELEASE(peer); + pmix_list_remove_item(&pmix_server_globals.nspaces, &nptr->super); + PMIX_RELEASE(nptr); // will release the info object + CLOSE_THE_SOCKET(pnd->sd); + goto done; + } + /* set the buffer type */ + peer->nptr->compat.type = pnd->buffer_type; + /* set the gds */ + PMIX_INFO_LOAD(&ginfo, PMIX_GDS_MODULE, pnd->gds, PMIX_STRING); + peer->nptr->compat.gds = pmix_gds_base_assign_module(&ginfo, 1); + if (NULL == peer->nptr->compat.gds) { + PMIX_RELEASE(peer); + pmix_list_remove_item(&pmix_server_globals.nspaces, &nptr->super); + PMIX_RELEASE(nptr); // will release the info object + CLOSE_THE_SOCKET(pnd->sd); + goto done; + } /* validate the connection */ PMIX_PSEC_VALIDATE_CONNECTION(rc, peer, diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/usock/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/usock/Makefile.am index 24a5cce109..e6606e2e84 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/usock/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/usock/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # 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$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/usock/ptl_usock.h b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/usock/ptl_usock.h index 9e45376f19..358b23ab37 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/usock/ptl_usock.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/ptl/usock/ptl_usock.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/runtime/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/runtime/Makefile.include index a4b7d80555..9c1c170dab 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/runtime/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/runtime/Makefile.include @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2012 Los Alamos National Security, LLC. # All rights reserved. -# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2014-2016 Intel, Inc. All rights reserved # Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/server/help-pmix-server.txt b/opal/mca/pmix/pmix2x/pmix/src/server/help-pmix-server.txt index d1fd6c7e80..894ec393ec 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/server/help-pmix-server.txt +++ b/opal/mca/pmix/pmix2x/pmix/src/server/help-pmix-server.txt @@ -1,6 +1,6 @@ # -*- text -*- # -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/tool/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/tool/Makefile.include index 7d04d20c6d..7d638ab8c5 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/tool/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/tool/Makefile.include @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2014-2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/tool/pmix_tool.c b/opal/mca/pmix/pmix2x/pmix/src/tool/pmix_tool.c index 0c05815df6..49c04c2fdc 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/tool/pmix_tool.c +++ b/opal/mca/pmix/pmix2x/pmix/src/tool/pmix_tool.c @@ -207,6 +207,7 @@ PMIX_EXPORT int PMIx_tool_init(pmix_proc_t *proc, PMIX_CONSTRUCT(&pmix_client_globals.pending_requests, pmix_list_t); pmix_client_globals.myserver = PMIX_NEW(pmix_peer_t); + pmix_client_globals.myserver->nptr = PMIX_NEW(pmix_nspace_t); pmix_output_verbose(2, pmix_globals.debug_output, "pmix: init called"); @@ -234,6 +235,14 @@ PMIX_EXPORT int PMIx_tool_init(pmix_proc_t *proc, /* the server will be using the same */ pmix_client_globals.myserver->nptr->compat.psec = pmix_globals.mypeer->nptr->compat.psec; + /* select the gds compat module */ + pmix_client_globals.myserver->nptr->compat.gds = pmix_gds_base_assign_module(NULL, 0); + if (NULL == pmix_client_globals.myserver->nptr->compat.gds) { + PMIX_INFO_DESTRUCT(&ginfo); + PMIX_RELEASE_THREAD(&pmix_global_lock); + return PMIX_ERR_INIT; + } + /* now select a GDS module for our own internal use - the user may * have passed down a directive for this purpose. If they did, then * use it. Otherwise, we want the "hash" module */ diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/util/Makefile.include index a42b51a5fa..1a4065dd32 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/util/Makefile.include @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2007-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2013 NVIDIA Corporation. 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 # and Technology (RIST). All rights reserved. # $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/alfg.c b/opal/mca/pmix/pmix2x/pmix/src/util/alfg.c index f29738ff9b..87e0e85172 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/alfg.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/alfg.c @@ -3,7 +3,7 @@ * All rights reserved. * Copyright (c) 2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/argv.c b/opal/mca/pmix/pmix2x/pmix/src/util/argv.c index 054fe14a48..f5c08f80a0 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/argv.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/argv.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2007 Voltaire. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. 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 * and Technology (RIST). All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/argv.h b/opal/mca/pmix/pmix2x/pmix/src/util/argv.h index 01e8a80ae0..44d83e7562 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/argv.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/argv.h @@ -13,7 +13,7 @@ * All rights reserved. * Copyright (c) 2007 Voltaire. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. 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 * and Technology (RIST). All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/basename.c b/opal/mca/pmix/pmix2x/pmix/src/util/basename.c index c7722bf33c..64e5c27e7e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/basename.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/basename.c @@ -12,7 +12,7 @@ * Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * 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$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/compress.c b/opal/mca/pmix/pmix2x/pmix/src/util/compress.c index 56b7bf1554..867a3d5e57 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/compress.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/compress.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/compress.h b/opal/mca/pmix/pmix2x/pmix/src/util/compress.h index d81cff74eb..b07b0d2ea7 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/compress.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/compress.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/crc.c b/opal/mca/pmix/pmix2x/pmix/src/util/crc.c index 3751a48535..5045e4509c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/crc.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/crc.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/crc.h b/opal/mca/pmix/pmix2x/pmix/src/util/crc.h index 9cfe66fea7..ed1e43d01c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/crc.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/crc.h @@ -12,7 +12,7 @@ * Copyright (c) 2009 IBM Corporation. All rights reserved. * Copyright (c) 2009 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/fd.c b/opal/mca/pmix/pmix2x/pmix/src/util/fd.c index db22cba329..616c6fe97c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/fd.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/fd.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 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 (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/fd.h b/opal/mca/pmix/pmix2x/pmix/src/util/fd.h index 70d2d09b19..d67fe24835 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/fd.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/fd.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 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 (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/getid.c b/opal/mca/pmix/pmix2x/pmix/src/util/getid.c index ebd821cf74..f3ad8a9dd4 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/getid.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/getid.c @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/keyval/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/util/keyval/Makefile.am index 66145e2353..70572ec8f1 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/keyval/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/util/keyval/Makefile.am @@ -9,7 +9,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.h b/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.h index eb91918edf..778982711d 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.h @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + # Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.l b/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.l index 320df3f9cd..9b9d0d6d14 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.l +++ b/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.l @@ -16,7 +16,6 @@ * All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/keyval_parse.c b/opal/mca/pmix/pmix2x/pmix/src/util/keyval_parse.c index 44eab45925..c07e65e668 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/keyval_parse.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/keyval_parse.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/keyval_parse.h b/opal/mca/pmix/pmix2x/pmix/src/util/keyval_parse.h index 5f2d54ccde..2d6e9f4c4e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/keyval_parse.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/keyval_parse.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/net.c b/opal/mca/pmix/pmix2x/pmix/src/util/net.c index 26de695ae2..b074a14dfa 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/net.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/net.c @@ -12,7 +12,7 @@ * Copyright (c) 2007 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/os_path.c b/opal/mca/pmix/pmix2x/pmix/src/util/os_path.c index e93596a821..6abedaf8a3 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/os_path.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/os_path.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/parse_options.c b/opal/mca/pmix/pmix2x/pmix/src/util/parse_options.c index 9111a87b09..d7679af6ac 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/parse_options.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/parse_options.c @@ -13,7 +13,7 @@ * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/parse_options.h b/opal/mca/pmix/pmix2x/pmix/src/util/parse_options.h index bdd30bf128..67e239052d 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/parse_options.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/parse_options.h @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/path.c b/opal/mca/pmix/pmix2x/pmix/src/util/path.c index 1b88d65fa3..4c532ef063 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/path.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/path.c @@ -13,7 +13,7 @@ * Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2016 University of Houston. All rights reserved. * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/pif.h b/opal/mca/pmix/pmix2x/pmix/src/util/pif.h index 5b2ebc8aa2..fb9f1b79a2 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/pif.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/pif.h @@ -13,7 +13,7 @@ * reserved. * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.c b/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.c index 1e1cfaaa88..ff5ef60da8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.c @@ -12,7 +12,7 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2013 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved. * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/printf.c b/opal/mca/pmix/pmix2x/pmix/src/util/printf.c index 551ff3bc6d..410c952154 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/printf.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/printf.c @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.h b/opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.h index 1fc3643213..a507e4ddd8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.h @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.l b/opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.l index 1e5e68daa3..d48130f0d8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.l +++ b/opal/mca/pmix/pmix2x/pmix/src/util/show_help_lex.l @@ -13,7 +13,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h b/opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h index b467fbf339..ec2401e346 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/timings.c b/opal/mca/pmix/pmix2x/pmix/src/util/timings.c index 799aa50adb..10779bbe76 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/timings.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/timings.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2014 Artem Polyakov - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/tsd.h b/opal/mca/pmix/pmix2x/pmix/src/util/tsd.h index a079152267..1149fca10e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/tsd.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/tsd.h @@ -4,7 +4,7 @@ * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/test/Makefile.am b/opal/mca/pmix/pmix2x/pmix/test/Makefile.am index ec37922965..f96895a9de 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/test/Makefile.am @@ -38,9 +38,7 @@ if WANT_PMI_BACKWARD noinst_PROGRAMS += pmi_client pmi2_client endif -if !WANT_HIDDEN noinst_PROGRAMS += pmix_test pmix_client pmix_regex -endif pmix_test_SOURCES = $(headers) \ pmix_test.c test_common.c cli_stages.c server_callbacks.c utils.c diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_cd.c b/opal/mca/pmix/pmix2x/pmix/test/test_cd.c index 9bd409a557..65471dff70 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_cd.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_cd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -16,13 +16,6 @@ typedef struct { int status; } cd_cbdata; -#define PMIX_WAIT_FOR_COMPLETION(a) \ - do { \ - while ((a)) { \ - usleep(10); \ - } \ - } while (0) - static void cd_cb(pmix_status_t status, void *cbdata) { cd_cbdata *cb = (cd_cbdata*)cbdata; @@ -92,4 +85,3 @@ int test_connect_disconnect(char *my_nspace, int my_rank) TEST_VERBOSE(("%s:%d: Disconnect non-blocking test succeded.", my_nspace, my_rank)); return PMIX_SUCCESS; } - diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_common.h b/opal/mca/pmix/pmix2x/pmix/test/test_common.h index d906c08778..0c2837553a 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_common.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_common.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 . * All rights reserved. * Copyright (c) 2015 Research Organization for Information Science @@ -26,6 +26,7 @@ #include #include +#include "src/include/pmix_globals.h" #include "src/class/pmix_list.h" #include "src/util/argv.h" @@ -271,12 +272,13 @@ typedef struct { nanosleep(&ts,NULL); \ count++; \ } \ + PMIX_ACQUIRE_OBJECT(&cbdata); \ } \ } \ if (PMIX_SUCCESS == rc) { \ if( PMIX_SUCCESS != cbdata.status ){ \ - if( !( rc == PMIX_ERR_NOT_FOUND && ok_notfnd ) ){ \ - TEST_VERBOSE(("%s:%d: PMIx_Get_nb failed: %d from %s:%d, key=%s", \ + if( !( cbdata.status == PMIX_ERR_NOT_FOUND && ok_notfnd ) ){ \ + TEST_ERROR(("%s:%d: PMIx_Get_nb failed: %d from %s:%d, key=%s", \ my_nspace, my_rank, rc, my_nspace, r)); \ } \ rc = PMIX_ERROR; \ @@ -285,7 +287,7 @@ typedef struct { rc = PMIX_ERROR; \ } \ else if (val->type != PMIX_VAL_TYPE_ ## dtype || PMIX_VAL_CMP(dtype, PMIX_VAL_FIELD_ ## dtype((val)), data)) { \ - TEST_VERBOSE(("%s:%u: from %s:%d Key %s value or type mismatch," \ + TEST_ERROR(("%s:%u: from %s:%d Key %s value or type mismatch," \ " want type %d get type %d", \ my_nspace, my_rank, ns, r, key, PMIX_VAL_TYPE_ ## dtype, val->type)); \ rc = PMIX_ERROR; \ diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_fence.c b/opal/mca/pmix/pmix2x/pmix/test/test_fence.c index 04dc775899..909edcffa3 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_fence.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_fence.c @@ -15,11 +15,13 @@ static void get_cb(pmix_status_t status, pmix_value_t *kv, void *cbdata) { get_cbdata *cb = (get_cbdata*)cbdata; + PMIX_ACQUIRE_OBJECT(cb); if (PMIX_SUCCESS == status) { pmix_value_xfer(cb->kv, kv); } - cb->in_progress = 0; cb->status = status; + PMIX_POST_OBJECT(cb); + cb->in_progress = 0; } static void add_noise(char *noise_param, char *my_nspace, pmix_rank_t my_rank) diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_spawn.c b/opal/mca/pmix/pmix2x/pmix/test/test_spawn.c index 4168319ca7..9251d4de0d 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_spawn.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_spawn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$ @@ -18,13 +18,6 @@ typedef struct { char nspace[PMIX_MAX_NSLEN]; } spawn_cbdata; -#define PMIX_WAIT_FOR_COMPLETION(a) \ - do { \ - while ((a)) { \ - usleep(10); \ - } \ - } while (0) - static void spawn_cb(pmix_status_t status, char nspace[], void *cbdata) { @@ -84,4 +77,3 @@ int test_spawn(char *my_nspace, int my_rank) TEST_VERBOSE(("%s:%d: Spawn non-blocking test succeded.", my_nspace, my_rank)); return PMIX_SUCCESS; } - diff --git a/opal/mca/pmix/pmix2x/pmix/test/utils.c b/opal/mca/pmix/pmix2x/pmix/test/utils.c index 1111a3cc95..f16e27e941 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/utils.c +++ b/opal/mca/pmix/pmix2x/pmix/test/utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015-2017 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2016 Research Organization for Information Science