Merge pull request #443 from hjelmn/mpit_31

Add new error code introduced in MPI-3.1.

ompi/errhandler/errcode.c

@@ -111,6 +111,7 @@ ompi_mpi_errcode_t ompi_err_rma_range;
 ompi_mpi_errcode_t ompi_err_rma_attach;
 ompi_mpi_errcode_t ompi_err_rma_flavor;
 ompi_mpi_errcode_t ompi_err_rma_shared;
+ompi_mpi_errcode_t ompi_t_err_invalid;
 
 static void ompi_mpi_errcode_construct(ompi_mpi_errcode_t* errcode);
 static void ompi_mpi_errcode_destruct(ompi_mpi_errcode_t* errcode);
@@ -210,6 +211,7 @@ int ompi_mpi_errcode_init (void)
     CONSTRUCT_ERRCODE( ompi_err_rma_attach, MPI_ERR_RMA_ATTACH, "MPI_ERR_RMA_ATTACH: Could not attach RMA segment" );
     CONSTRUCT_ERRCODE( ompi_err_rma_flavor, MPI_ERR_RMA_FLAVOR, "MPI_ERR_RMA_FLAVOR: Invalid type of window" );
     CONSTRUCT_ERRCODE( ompi_err_rma_shared, MPI_ERR_RMA_SHARED, "MPI_ERR_RMA_SHARED: Memory cannot be shared" );
+    CONSTRUCT_ERRCODE( ompi_t_err_invalid, MPI_T_ERR_INVALID, "MPI_T_ERR_INVALID: Invalid use of the interface or bad parameter value(s)" );
 
     /* Per MPI-3 p353:27-32, MPI_LASTUSEDCODE must be >=
        MPI_ERR_LASTCODE.  So just start it as == MPI_ERR_LASTCODE. */
@@ -304,6 +306,7 @@ int ompi_mpi_errcode_finalize(void)
     OBJ_DESTRUCT(&ompi_err_rma_attach);
     OBJ_DESTRUCT(&ompi_err_rma_flavor);
     OBJ_DESTRUCT(&ompi_err_rma_shared);
+    OBJ_DESTRUCT(&ompi_t_err_invalid);
 
     OBJ_DESTRUCT(&ompi_mpi_errcodes);
     return OMPI_SUCCESS;

ompi/include/mpi.h.in

@@ -13,7 +13,8 @@
  * Copyright (c) 2008-2009 Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2009-2012 Oak Rigde National Laboratory.  All rights reserved.
  * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
- * Copyright (c) 2012-2014 Los Alamos Nat Security, LLC. All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * Copyright (c) 2011-2013 INRIA.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -602,11 +603,12 @@ enum {
 #define MPI_ERR_RMA_ATTACH            69
 #define MPI_ERR_RMA_FLAVOR            70
 #define MPI_ERR_RMA_SHARED            71
+#define MPI_T_ERR_INVALID             72
 
 /* Per MPI-3 p349 47, MPI_ERR_LASTCODE must be >= the last predefined
-   MPI_ERR_<foo> code.  So just set it equal to the last code --
-   MPI_ERR_RMA_SHARED, in this case. */
-#define MPI_ERR_LASTCODE              MPI_ERR_RMA_SHARED
+   MPI_ERR_<foo> code. Set the last code to allow some room for adding
+   error codes without breaking ABI. */
+#define MPI_ERR_LASTCODE              92
 
 #define MPI_ERR_SYSRESOURCE          -2
 

ompi/include/mpif-values.pl

@@ -325,7 +325,8 @@ $constants->{MPI_ERR_RMA_RANGE} = 68;
 $constants->{MPI_ERR_RMA_ATTACH} = 69;
 $constants->{MPI_ERR_RMA_FLAVOR} = 70;
 $constants->{MPI_ERR_RMA_SHARED} = 71;
-$constants->{MPI_ERR_LASTCODE} = $constants->{MPI_ERR_RMA_SHARED};
+$constants->{MPI_T_ERR_INVALID} = 72;
+$constants->{MPI_ERR_LASTCODE} = 92;
 
 $constants->{MPI_ERR_SYSRESOURCE} = -2;