pml/ob1: custom matching cleanup and configury

This commit updates the new custom matching code in pml/ob1 so it can
not be enabled with a configure option. This commit also renames the
fuzzy-matching headers to avoid potential name conflicts and removes
the use of C reserved identifiers.

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>

Author: hjelmn

ompi/mca/pml/ob1/Makefile.am

@@ -47,7 +47,14 @@ ob1_sources  = \
 	pml_ob1_recvreq.h \
 	pml_ob1_sendreq.c \
 	pml_ob1_sendreq.h \
-	pml_ob1_start.c
+	pml_ob1_start.c \
+	custommatch/pml_ob1_custom_match.h \
+	custommatch/pml_ob1_custom_match_arrays.h \
+	custommatch/pml_ob1_custom_match_vectors.h \
+	custommatch/pml_ob1_custom_match_linkedlist.h \
+	custommatch/pml_ob1_custom_match_fuzzy512-byte.h \
+	custommatch/pml_ob1_custom_match_fuzzy512-short.h \
+	custommatch/pml_ob1_custom_match_fuzzy512-word.h
 
 # If we have CUDA support requested, build the CUDA file also
 if OPAL_cuda_support

ompi/mca/pml/ob1/configure.m4

@@ -22,6 +22,44 @@ AC_DEFUN([MCA_ompi_pml_ob1_POST_CONFIG], [
 # ------------------------------------------------
 # We can always build, unless we were explicitly disabled.
 AC_DEFUN([MCA_ompi_pml_ob1_CONFIG],[
+    OPAL_VAR_SCOPE_PUSH([pml_ob1_matching_engine])
+    AC_ARG_WITH([pml-ob1-matching], [AC_HELP_STRING([--with-pml-ob1-matching=type],
+                                                    [Configure pml/ob1 to use an alternate matching engine. Only valid on x86_64 systems.
+                                                     Valid values are: none, default, arrays, fuzzy-byte, fuzzy-short, fuzzy-word, vector (default: none)])])
+
+    pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_NONE
+
+    if test -n "$with_pml_ob1_matching" ; then
+        case $with_pml_ob1_matching in
+            none)
+                pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_NONE
+                ;;
+            default)
+                pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_LINKEDLIST
+                ;;
+            arrays)
+                pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_ARRAYS
+                ;;
+            fuzzy-byte)
+                pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_BYTE
+                ;;
+            fuzzy-short)
+                pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_SHORT
+                ;;
+            fuzzy-word)
+                pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_WORD
+                ;;
+            vector)
+                pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_VECTOR
+                ;;
+            *)
+                AC_ERROR([invalid matching type specified for --pml-ob1-matching: $with_pml_ob1_matching])
+                ;;
+        esac
+    fi
+
+    AC_DEFINE_UNQUOTED([MCA_PML_OB1_CUSTOM_MATCHING], [$pml_ob1_matching_engine], [Custom matching engine to use in pml/ob1])
+
     AC_CONFIG_FILES([ompi/mca/pml/ob1/Makefile])
     [$1]
 ])dnl