osc/base: Consolidate error messages for unsupported dt

Signed-off-by: Joshua Hursey <[email protected]>

Author: jjhursey

ompi/mca/osc/base/Makefile.am

@@ -7,13 +7,16 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2017 IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
 
+dist_ompidata_DATA = base/help-mca-osc-base.txt
+
 headers += \
         base/base.h \
 	base/osc_base_obj_convert.h

ompi/mca/osc/base/help-mca-osc-base.txt

@@ -0,0 +1,18 @@
+# -*- text -*-
+#
+# Copyright (c) 2017      IBM Corporation.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# This is the US/English help file for Open MPI MCA osc-specific
+# error messages.
+#
+[unsupported-dt]
+Unsupported datatype and op combination used in a one-sided operation.
+
+ Datatype : %s
+ Operation: %s
+ Rank     : %d

ompi/mca/osc/base/osc_base_obj_convert.c

@@ -78,21 +78,20 @@ int ompi_osc_base_process_op (void *outbuf, void *inbuf, size_t inbuflen,
         return OMPI_ERR_NOT_SUPPORTED;
     }
 
-    /* TODO: Remove the following check when ompi adds support */
+    /* TODO: Remove the following check when support is added.
+     * See the following issue for the current state:
+     *   https://github.com/open-mpi/ompi/issues/1666
+     */
     if(MPI_MINLOC == op || MPI_MAXLOC == op) {
         if(MPI_SHORT_INT == datatype ||
            MPI_DOUBLE_INT == datatype ||
            MPI_LONG_INT == datatype ||
            MPI_LONG_DOUBLE_INT == datatype) {
            ompi_communicator_t *comm = &ompi_mpi_comm_world.comm;
-           opal_output(0, "Error: %s datatype is currently "
-                       "unsupported for MPI_MINLOC/MPI_MAXLOC "
-                       "operation\n", datatype->name);
-           opal_show_help("help-mpi-api.txt", "mpi-abort", true,
-                          comm->c_my_rank,
-                          ('\0' != comm->c_name[0]) ? comm->c_name : "<Unknown>",
-                          -1);
-
+           opal_show_help("help-mca-osc-base.txt", "unsupported-dt", true,
+                          datatype->name,
+                          op->o_name,
+                          comm->c_my_rank);
            ompi_mpi_abort(comm, -1);
         }
     }