Merge pull request #887 from rhc54/cmr22/clean

Ensure we only open the pshmem framework once
openpmix · Oct 19, 2018 · 5c207fe · 5c207fe
2 parents 9a1a55b + 065f19a
commit 5c207fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/config/pmix_mca.m4 b/config/pmix_mca.m4
@@ -11,7 +11,7 @@ dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
-dnl Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2013-2018 Intel, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -428,7 +428,7 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
     # Create the final .h file that will be included in the type's
     # top-level glue.  This lists all the static components.  We don't
     # need to do this for "common".
-    if test "$2" != "common"; then
+    if test "$1" != "common"; then
         cat > $outfile <<EOF
 /*
  * \$HEADER\$

diff --git a/src/mca/pshmem/base/pshmem_base_frame.c b/src/mca/pshmem/base/pshmem_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-2018 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
@@ -60,6 +60,9 @@ static pmix_status_t pmix_pshmem_close(void)
 
 static pmix_status_t pmix_pshmem_open(pmix_mca_base_open_flag_t flags)
 {
+    if (initialized) {
+        return PMIX_SUCCESS;
+    }
     /* initialize globals */
     initialized = true;