From b933eda36b4f0de724d9b48e54e26d3728c9fe89 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Thu, 13 Aug 2015 13:18:29 -0600 Subject: [PATCH] ompi: add internal error code for MPI_ERR_RMA_FLAVOR Signed-off-by: Nathan Hjelm --- ompi/errhandler/errcode-internal.c | 10 ++++++++++ ompi/include/ompi/constants.h | 1 + 2 files changed, 11 insertions(+) diff --git a/ompi/errhandler/errcode-internal.c b/ompi/errhandler/errcode-internal.c index 4fc83aed93..37429f6ff8 100644 --- a/ompi/errhandler/errcode-internal.c +++ b/ompi/errhandler/errcode-internal.c @@ -55,6 +55,7 @@ static ompi_errcode_intern_t ompi_err_rma_attach_intern; static ompi_errcode_intern_t ompi_err_rma_range_intern; static ompi_errcode_intern_t ompi_err_rma_conflict_intern; static ompi_errcode_intern_t ompi_err_win_intern; +static ompi_errcode_intern_t ompi_err_rma_flavor_intern; static void ompi_errcode_intern_construct(ompi_errcode_intern_t* errcode); static void ompi_errcode_intern_destruct(ompi_errcode_intern_t* errcode); @@ -250,6 +251,14 @@ int ompi_errcode_intern_init (void) opal_pointer_array_set_item(&ompi_errcodes_intern, ompi_err_win_intern.index, &ompi_err_win_intern); + OBJ_CONSTRUCT(&ompi_err_rma_flavor_intern, ompi_errcode_intern_t); + ompi_err_rma_flavor_intern.code = OMPI_ERR_RMA_FLAVOR; + ompi_err_rma_flavor_intern.mpi_code = MPI_ERR_RMA_FLAVOR; + ompi_err_rma_flavor_intern.index = pos++; + strncpy(ompi_err_rma_flavor_intern.errstring, "OMPI_ERR_RMA_FLAVOR", OMPI_MAX_ERROR_STRING); + opal_pointer_array_set_item(&ompi_errcodes_intern, ompi_err_rma_flavor_intern.index, + &ompi_err_rma_flavor_intern); + ompi_errcode_intern_lastused=pos; return OMPI_SUCCESS; } @@ -279,6 +288,7 @@ int ompi_errcode_intern_finalize(void) OBJ_DESTRUCT(&ompi_err_rma_range_intern); OBJ_DESTRUCT(&ompi_err_rma_conflict_intern); OBJ_DESTRUCT(&ompi_err_win_intern); + OBJ_DESTRUCT(&ompi_err_rma_flavor_intern); OBJ_DESTRUCT(&ompi_errcodes_intern); return OMPI_SUCCESS; diff --git a/ompi/include/ompi/constants.h b/ompi/include/ompi/constants.h index 0e33ad4ca4..dbe9001bac 100644 --- a/ompi/include/ompi/constants.h +++ b/ompi/include/ompi/constants.h @@ -71,6 +71,7 @@ enum { OMPI_ERR_RMA_RANGE = OMPI_ERR_BASE - 5, OMPI_ERR_RMA_CONFLICT = OMPI_ERR_BASE - 6, OMPI_ERR_WIN = OMPI_ERR_BASE - 7, + OMPI_ERR_RMA_FLAVOR = OMPI_ERR_BASE - 8, }; #define OMPI_ERR_MAX (OMPI_ERR_BASE - 100)