Ensure consistency between ompi and opal callback safety requirement

values.

Signed-off-by: Chris Chambreau <chambreau1@llnl.gov>

Author: cchambreau

configure.ac

@@ -190,6 +190,12 @@ AC_MSG_CHECKING([for bootstrap Libtool version])
 ltversion=`grep VERSION= $srcdir/config/ltmain.sh | head -n 1 | cut -d= -f2`
 AC_MSG_RESULT([$ltversion])
 
+# Ensure mpi.h.in and mca_base_event.h have consistent callback safety values
+AC_DEFINE_UNQUOTED([OPAL_MCA_BASE_CB_REQUIRE_NONE], [0], [Keeping OPAL and OMPI values in sync])
+AC_DEFINE_UNQUOTED([OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED], [1], [Keeping OPAL and OMPI values in sync])
+AC_DEFINE_UNQUOTED([OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE], [2], [Keeping OPAL and OMPI values in sync])
+AC_DEFINE_UNQUOTED([OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE], [3], [Keeping OPAL and OMPI values in sync])
+
 # List header files to generate
 
 AC_CONFIG_HEADERS([opal/include/opal_config.h])
@@ -1399,6 +1405,7 @@ if test $ac_cv_header_sys_synch_h = yes ; then
               [Do not use outside of mpi.h.  Define to 1 if you have the <sys/synch.h> header file.])
 fi
 
+
 # If there is a local hook for each project, call it.  This allows 3rd
 # parties to add configuration steps to OPAL and/or OMPI simply
 # by placing a file in [opal|ompi]/config/whatever.m4 that

ompi/include/mpi.h.in

@@ -923,12 +923,18 @@ enum {
 
 /*
  * MPIT callback safety levels
+ *
+ * Values are set in configure.ac for consistency with mca_base_event.h
  */
+#undef OPAL_MCA_BASE_CB_REQUIRE_NONE
+#undef OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED
+#undef OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE
+#undef OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE
 typedef enum {
-  MPI_T_CB_REQUIRE_NONE,
-  MPI_T_CB_REQUIRE_MPI_RESTRICTED,
-  MPI_T_CB_REQUIRE_THREAD_SAFE,
-  MPI_T_CB_REQUIRE_ASYNC_SIGNAL_SAFE
+    MPI_T_CB_REQUIRE_NONE = OPAL_MCA_BASE_CB_REQUIRE_NONE,
+    MPI_T_CB_REQUIRE_MPI_RESTRICTED = OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED,
+    MPI_T_CB_REQUIRE_THREAD_SAFE = OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE,
+    MPI_T_CB_REQUIRE_ASYNC_SIGNAL_SAFE = OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE
 } MPI_T_cb_safety;
 
 /*

opal/mca/base/mca_base_event.h

@@ -42,13 +42,13 @@ typedef enum {
 /**
  * @basic Callback safety levels
  *
- * If these are modified then similar modifications will be needed in mpi.h.in.
+ * Values are set in configure.ac for consistency with mpi.h
  */
 typedef enum {
-    MCA_BASE_CB_REQUIRE_NONE,
-    MCA_BASE_CB_REQUIRE_MPI_RESTRICTED,
-    MCA_BASE_CB_REQUIRE_THREAD_SAFE,
-    MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
+    MCA_BASE_CB_REQUIRE_NONE = OPAL_MCA_BASE_CB_REQUIRE_NONE,
+    MCA_BASE_CB_REQUIRE_MPI_RESTRICTED = OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED,
+    MCA_BASE_CB_REQUIRE_THREAD_SAFE = OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE,
+    MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE = OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE,
     MCA_BASE_CB_SAFETY_MAX,
 } mca_base_cb_safety_t;