This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 675f028aa7855208445588b7c731e20e0db2f0f8 (commit) from 6efd9ddefcf523d4cfd02655cab91bcc7f5c1baa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/675f028aa7855208445588b7c731e20e0d... commit 675f028aa7855208445588b7c731e20e0db2f0f8 Author: Junchao Zhang <[email protected]> Date: Wed Mar 4 15:09:15 2015 -0600 Change MPI-3.1 MPI_T stuff to MPIX_T Since MPI-3.1 has not been voted this time. Signed-off-by: Antonio J. Pena <[email protected]> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index c78ae17..14366c3 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -865,14 +865,12 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); #define MPI_T_ERR_PVAR_NO_STARTSTOP 70 /* Pvar can't be started or stopped */ #define MPI_T_ERR_PVAR_NO_WRITE 71 /* Pvar can't be written or reset */ #define MPI_T_ERR_PVAR_NO_ATOMIC 72 /* Pvar can't be R/W atomically */ -#define MPI_T_ERR_INVALID_NAME 73 /* Name doesn't match */ -#define MPI_T_ERR_INVALID 74 /* Generic error code for MPI_T added in MPI-3.1 */ #define MPI_ERR_LASTCODE 0x3fffffff /* Last valid error code for a predefined error class */ /* WARNING: this is also defined in mpishared.h. Update both locations */ -#define MPICH_ERR_LAST_CLASS 74 /* It is also helpful to know the +#define MPICH_ERR_LAST_CLASS 72 /* It is also helpful to know the last valid class */ #define MPICH_ERR_FIRST_MPIX 100 /* Define a gap here because sock is @@ -884,8 +882,10 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); #define MPIX_ERR_PROC_FAILED_PENDING MPICH_ERR_FIRST_MPIX+2 /* A failure has caused this request * to be pending */ #define MPIX_ERR_REVOKED MPICH_ERR_FIRST_MPIX+3 /* The communciation object has been revoked */ +#define MPIX_T_ERR_INVALID_NAME MPICH_ERR_FIRST_MPIX+4 /* Name doesn't match */ +#define MPIX_T_ERR_INVALID MPICH_ERR_FIRST_MPIX+5 /* Generic error code for MPI_T added in MPI-3.1 */ -#define MPICH_ERR_LAST_MPIX MPICH_ERR_FIRST_MPIX+3 +#define MPICH_ERR_LAST_MPIX MPICH_ERR_FIRST_MPIX+5 /* End of MPI's error classes */ @@ -1532,9 +1532,9 @@ int MPI_T_category_get_cvars(int cat_index, int len, int indices[]); int MPI_T_category_get_pvars(int cat_index, int len, int indices[]); int MPI_T_category_get_categories(int cat_index, int len, int indices[]); int MPI_T_category_changed(int *stamp); -int MPI_T_cvar_get_index(const char *name, int *cvar_index); -int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index); -int MPI_T_category_get_index(const char *name, int *cat_index); +int MPIX_T_cvar_get_index(const char *name, int *cvar_index); +int MPIX_T_pvar_get_index(const char *name, int var_class, int *pvar_index); +int MPIX_T_category_get_index(const char *name, int *cat_index); /* End Skip Prototypes */ @@ -2178,9 +2178,9 @@ int PMPI_T_category_get_cvars(int cat_index, int len, int indices[]); int PMPI_T_category_get_pvars(int cat_index, int len, int indices[]); int PMPI_T_category_get_categories(int cat_index, int len, int indices[]); int PMPI_T_category_changed(int *stamp); -int PMPI_T_cvar_get_index(const char *name, int *cvar_index); -int PMPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index); -int PMPI_T_category_get_index(const char *name, int *cat_index); +int PMPIX_T_cvar_get_index(const char *name, int *cvar_index); +int PMPIX_T_pvar_get_index(const char *name, int var_class, int *pvar_index); +int PMPIX_T_category_get_index(const char *name, int *cat_index); /* End Skip Prototypes */ diff --git a/src/include/mpishared.h b/src/include/mpishared.h index 16cf8ed..46a6bf1 100644 --- a/src/include/mpishared.h +++ b/src/include/mpishared.h @@ -62,7 +62,7 @@ #include "mpierrs.h" /* FIXME: This is extracted from mpi.h.in, where it may not be appropriate */ -#define MPICH_ERR_LAST_CLASS 74 /* It is also helpful to know the +#define MPICH_ERR_LAST_CLASS 72 /* It is also helpful to know the last valid class */ #include "mpifunc.h" diff --git a/src/mpi_t/cat_get_index.c b/src/mpi_t/cat_get_index.c index 331ef2b..44d6ee1 100644 --- a/src/mpi_t/cat_get_index.c +++ b/src/mpi_t/cat_get_index.c @@ -6,31 +6,31 @@ #include "mpiimpl.h" -/* -- Begin Profiling Symbol Block for routine MPI_T_category_get_index */ +/* -- Begin Profiling Symbol Block for routine MPIX_T_category_get_index */ #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_T_category_get_index = PMPI_T_category_get_index +#pragma weak MPIX_T_category_get_index = PMPIX_T_category_get_index #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_T_category_get_index MPI_T_category_get_index +#pragma _HP_SECONDARY_DEF PMPIX_T_category_get_index MPIX_T_category_get_index #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_T_category_get_index as PMPI_T_category_get_index +#pragma _CRI duplicate MPIX_T_category_get_index as PMPIX_T_category_get_index #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_T_category_get_index(const char *name, int *cat_index) __attribute__((weak,alias("PMPI_T_category_get_index"))); +int MPIX_T_category_get_index(const char *name, int *cat_index) __attribute__((weak,alias("PMPIX_T_category_get_index"))); #endif /* -- End Profiling Symbol Block */ /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI -#undef MPI_T_category_get_index -#define MPI_T_category_get_index PMPI_T_category_get_index +#undef MPIX_T_category_get_index +#define MPIX_T_category_get_index PMPIX_T_category_get_index #endif /* MPICH_MPI_FROM_PMPI */ #undef FUNCNAME -#define FUNCNAME MPI_T_category_get_index +#define FUNCNAME MPIX_T_category_get_index #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_category_get_index - Get the index of a category +MPIX_T_category_get_index - Get the index of a category Output Parameters: . name - the name of the category (string) @@ -42,17 +42,17 @@ Output Parameters: .N Errors .N MPI_SUCCESS -.N MPI_T_ERR_INVALID_NAME +.N MPIX_T_ERR_INVALID_NAME .N MPI_T_ERR_NOT_INITIALIZED @*/ -int MPI_T_category_get_index(const char *name, int *cat_index) +int MPIX_T_category_get_index(const char *name, int *cat_index) { int mpi_errno = MPI_SUCCESS; - MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + MPID_MPI_STATE_DECL(MPID_STATE_MPIX_T_CATEGORY_GET_INDEX); MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); MPIR_T_THREAD_CS_ENTER(); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_T_CATEGORY_GET_INDEX); /* Validate parameters */ # ifdef HAVE_ERROR_CHECKING @@ -75,14 +75,14 @@ int MPI_T_category_get_index(const char *name, int *cat_index) if (hash_entry != NULL) { *cat_index = hash_entry->idx; } else { - mpi_errno = MPI_T_ERR_INVALID_NAME; + mpi_errno = MPIX_T_ERR_INVALID_NAME; goto fn_fail; } /* ... end of body of routine ... */ fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_CATEGORY_GET_INDEX); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_T_CATEGORY_GET_INDEX); MPIR_T_THREAD_CS_EXIT(); return mpi_errno; diff --git a/src/mpi_t/cvar_get_index.c b/src/mpi_t/cvar_get_index.c index e40abbb..a18e181 100644 --- a/src/mpi_t/cvar_get_index.c +++ b/src/mpi_t/cvar_get_index.c @@ -6,31 +6,31 @@ #include "mpiimpl.h" -/* -- Begin Profiling Symbol Block for routine MPI_T_cvar_get_index */ +/* -- Begin Profiling Symbol Block for routine MPIX_T_cvar_get_index */ #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_T_cvar_get_index = PMPI_T_cvar_get_index +#pragma weak MPIX_T_cvar_get_index = PMPIX_T_cvar_get_index #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_T_cvar_get_index MPI_T_cvar_get_index +#pragma _HP_SECONDARY_DEF PMPIX_T_cvar_get_index MPIX_T_cvar_get_index #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_T_cvar_get_index as PMPI_T_cvar_get_index +#pragma _CRI duplicate MPIX_T_cvar_get_index as PMPIX_T_cvar_get_index #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_T_cvar_get_index(const char *name, int *cvar_index) __attribute__((weak,alias("PMPI_T_cvar_get_index"))); +int MPIX_T_cvar_get_index(const char *name, int *cvar_index) __attribute__((weak,alias("PMPIX_T_cvar_get_index"))); #endif /* -- End Profiling Symbol Block */ /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI -#undef MPI_T_cvar_get_index -#define MPI_T_cvar_get_index PMPI_T_cvar_get_index +#undef MPIX_T_cvar_get_index +#define MPIX_T_cvar_get_index PMPIX_T_cvar_get_index #endif /* MPICH_MPI_FROM_PMPI */ #undef FUNCNAME -#define FUNCNAME MPI_T_cvar_get_index +#define FUNCNAME MPIX_T_cvar_get_index #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_cvar_get_index - Get the index of a control variable +MPIX_T_cvar_get_index - Get the index of a control variable Output Parameters: . name - name of the control variable (string) @@ -42,17 +42,17 @@ Output Parameters: .N Errors .N MPI_SUCCESS -.N MPI_T_ERR_INVALID_NAME +.N MPIX_T_ERR_INVALID_NAME .N MPI_T_ERR_NOT_INITIALIZED @*/ -int MPI_T_cvar_get_index(const char *name, int *cvar_index) +int MPIX_T_cvar_get_index(const char *name, int *cvar_index) { int mpi_errno = MPI_SUCCESS; - MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_CVAR_GET_INDEX); + MPID_MPI_STATE_DECL(MPID_STATE_MPIX_T_CVAR_GET_INDEX); MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); MPIR_T_THREAD_CS_ENTER(); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_CVAR_GET_INDEX); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_T_CVAR_GET_INDEX); /* Validate parameters */ # ifdef HAVE_ERROR_CHECKING @@ -75,14 +75,14 @@ int MPI_T_cvar_get_index(const char *name, int *cvar_index) if (hash_entry != NULL) { *cvar_index = hash_entry->idx; } else { - mpi_errno = MPI_T_ERR_INVALID_NAME; + mpi_errno = MPIX_T_ERR_INVALID_NAME; goto fn_fail; } /* ... end of body of routine ... */ fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_CVAR_GET_INDEX); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_T_CVAR_GET_INDEX); MPIR_T_THREAD_CS_EXIT(); return mpi_errno; diff --git a/src/mpi_t/errnames.txt b/src/mpi_t/errnames.txt index 37c7f3c..cbb3f7d 100644 --- a/src/mpi_t/errnames.txt +++ b/src/mpi_t/errnames.txt @@ -66,9 +66,9 @@ **mpi_t_category_get_categories %d %d %p: MPI_T_category_get_categories(cat_index=%d, len=%d, indices=%p) **mpi_t_category_changed: MPI_T_category_changed failed **mpi_t_category_changed %p: MPI_T_category_changed(stamp=%p) -**mpi_t_cvar_get_index: mpi_t_cvar_get_index failed -**mpi_t_cvar_get_index %p %p: mpi_t_cvar_get_index(name=%p, cvar_index=%p) -**mpi_t_pvar_get_index: mpi_t_pvar_get_index failed -**mpi_t_pvar_get_index %p %d %p: mpi_t_pvar_get_index(name=%p, var_class=%d, pvar_index=%p) -**mpi_t_category_get_index: mpi_t_category_get_index failed -**mpi_t_category_get_index %p %p: mpi_t_category_get_index(name=%p, cat_index=%p) +**mpix_t_cvar_get_index: mpix_t_cvar_get_index failed +**mpix_t_cvar_get_index %p %p: mpix_t_cvar_get_index(name=%p, cvar_index=%p) +**mpix_t_pvar_get_index: mpix_t_pvar_get_index failed +**mpix_t_pvar_get_index %p %d %p: mpix_t_pvar_get_index(name=%p, var_class=%d, pvar_index=%p) +**mpix_t_category_get_index: mpix_t_category_get_index failed +**mpix_t_category_get_index %p %p: mpix_t_category_get_index(name=%p, cat_index=%p) diff --git a/src/mpi_t/pvar_get_index.c b/src/mpi_t/pvar_get_index.c index bb1639c..b65408c 100644 --- a/src/mpi_t/pvar_get_index.c +++ b/src/mpi_t/pvar_get_index.c @@ -6,31 +6,31 @@ #include "mpiimpl.h" -/* -- Begin Profiling Symbol Block for routine MPI_T_pvar_get_index */ +/* -- Begin Profiling Symbol Block for routine MPIX_T_pvar_get_index */ #if defined(HAVE_PRAGMA_WEAK) -#pragma weak MPI_T_pvar_get_index = PMPI_T_pvar_get_index +#pragma weak MPIX_T_pvar_get_index = PMPIX_T_pvar_get_index #elif defined(HAVE_PRAGMA_HP_SEC_DEF) -#pragma _HP_SECONDARY_DEF PMPI_T_pvar_get_index MPI_T_pvar_get_index +#pragma _HP_SECONDARY_DEF PMPIX_T_pvar_get_index MPIX_T_pvar_get_index #elif defined(HAVE_PRAGMA_CRI_DUP) -#pragma _CRI duplicate MPI_T_pvar_get_index as PMPI_T_pvar_get_index +#pragma _CRI duplicate MPIX_T_pvar_get_index as PMPIX_T_pvar_get_index #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) __attribute__((weak,alias("PMPI_T_pvar_get_index"))); +int MPIX_T_pvar_get_index(const char *name, int var_class, int *pvar_index) __attribute__((weak,alias("PMPIX_T_pvar_get_index"))); #endif /* -- End Profiling Symbol Block */ /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI -#undef MPI_T_pvar_get_index -#define MPI_T_pvar_get_index PMPI_T_pvar_get_index +#undef MPIX_T_pvar_get_index +#define MPIX_T_pvar_get_index PMPIX_T_pvar_get_index #endif /* MPICH_MPI_FROM_PMPI */ #undef FUNCNAME -#define FUNCNAME MPI_T_pvar_get_index +#define FUNCNAME MPIX_T_pvar_get_index #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) /*@ -MPI_T_pvar_get_index - Get the index of a performance variable +MPIX_T_pvar_get_index - Get the index of a performance variable Input Parameters: . name - the name of the performance variable (string) @@ -43,17 +43,17 @@ Output Parameters: .N Errors .N MPI_SUCCESS -.N MPI_T_ERR_INVALID_NAME +.N MPIX_T_ERR_INVALID_NAME .N MPI_T_ERR_NOT_INITIALIZED @*/ -int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) +int MPIX_T_pvar_get_index(const char *name, int var_class, int *pvar_index) { int mpi_errno = MPI_SUCCESS; - MPID_MPI_STATE_DECL(MPID_STATE_MPI_T_PVAR_GET_INDEX); + MPID_MPI_STATE_DECL(MPID_STATE_MPIX_T_PVAR_GET_INDEX); MPIR_ERRTEST_MPIT_INITIALIZED(mpi_errno); MPIR_T_THREAD_CS_ENTER(); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_T_PVAR_GET_INDEX); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_T_PVAR_GET_INDEX); /* Validate parameters */ # ifdef HAVE_ERROR_CHECKING @@ -65,7 +65,7 @@ int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) if (var_class < MPIR_T_PVAR_CLASS_FIRST || var_class >= MPIR_T_PVAR_CLASS_LAST) { - mpi_errno = MPI_T_ERR_INVALID_NAME; + mpi_errno = MPIX_T_ERR_INVALID_NAME; goto fn_fail; } } @@ -83,14 +83,14 @@ int MPI_T_pvar_get_index(const char *name, int var_class, int *pvar_index) if (hash_entry != NULL) { *pvar_index = hash_entry->idx; } else { - mpi_errno = MPI_T_ERR_INVALID_NAME; + mpi_errno = MPIX_T_ERR_INVALID_NAME; goto fn_fail; } /* ... end of body of routine ... */ fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_T_PVAR_GET_INDEX); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_T_PVAR_GET_INDEX); MPIR_T_THREAD_CS_EXIT(); return mpi_errno; diff --git a/src/mpi_t/pvar_read.c b/src/mpi_t/pvar_read.c index de4c718..ab40212 100644 --- a/src/mpi_t/pvar_read.c +++ b/src/mpi_t/pvar_read.c @@ -35,11 +35,12 @@ int MPIR_T_pvar_read_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle, int i, mpi_errno = MPI_SUCCESS; /* Reading a never started pvar, or a stopped and then reset wartermark, - * will run into this nasty situation. Return a generic MPI_T error code, - * which is defined in MPI-3.1. + * will run into this nasty situation. MPI-3.0 does not define what error + * code should be returned. We return a generic MPI error code. Once MPI-3.1 + * is approved, it should be changed to MPI_T_ERR_INVALID. */ if (!MPIR_T_pvar_is_oncestarted(handle)) { - mpi_errno = MPI_T_ERR_INVALID; + mpi_errno = MPI_ERR_OTHER; goto fn_fail; } diff --git a/test/mpi/mpi_t/getindex.c b/test/mpi/mpi_t/getindex.c index ede43a6..6e13bcf 100644 --- a/test/mpi/mpi_t/getindex.c +++ b/test/mpi/mpi_t/getindex.c @@ -4,7 +4,7 @@ * See COPYRIGHT in top-level directory. */ -/* Test MPI_T_xxx_get_index() for cvars, pvars and categories. +/* Test MPIX_T_xxx_get_index() for cvars, pvars and categories. */ #include <stdio.h> #include "mpi.h" @@ -25,23 +25,23 @@ int main(int argc, char *argv[]) MPI_T_init_thread(required, &provided); MPI_Init(&argc, &argv); - /* Test MPI_T_cvar_get_index with both valid and bogus names */ + /* Test MPIX_T_cvar_get_index with both valid and bogus names */ MPI_T_cvar_get_num(&num_cvar); if (verbose) fprintf(stdout, "%d MPI Control Variables\n", num_cvar); for (i = 0; i < num_cvar; i++) { namelen = sizeof(name); MPI_T_cvar_get_info(i, name, &namelen, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (namelen <= 128) { - errno = MPI_T_cvar_get_index(name, &cvar_index); + errno = MPIX_T_cvar_get_index(name, &cvar_index); if (errno != MPI_SUCCESS || cvar_index != i) errs++; } } - errno = MPI_T_cvar_get_index("AN INVALID CVAR NAME FOR TEST", &cvar_index); - if (errno != MPI_T_ERR_INVALID_NAME) errs++; + errno = MPIX_T_cvar_get_index("AN INVALID CVAR NAME FOR TEST", &cvar_index); + if (errno != MPIX_T_ERR_INVALID_NAME) errs++; - if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + if (errs) fprintf(stdout, "Errors found in MPIX_T_cvar_get_index\n"); - /* Test MPI_T_pvar_get_index with both valid and bogus names */ + /* Test MPIX_T_pvar_get_index with both valid and bogus names */ MPI_T_pvar_get_num(&num_pvar); if (verbose) fprintf(stdout, "%d MPI Performance Variables\n", num_pvar); @@ -50,28 +50,28 @@ int main(int argc, char *argv[]) MPI_T_pvar_get_info(i, name, &namelen, NULL, &pvar_class, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (namelen <= 128) { - errno = MPI_T_pvar_get_index(name, pvar_class, &pvar_index); + errno = MPIX_T_pvar_get_index(name, pvar_class, &pvar_index); if (errno != MPI_SUCCESS || pvar_index != i) errs++; } } - errno = MPI_T_pvar_get_index("AN INVALID PVAR NAME FOR TEST", MPI_T_PVAR_CLASS_COUNTER, &cvar_index); - if (errno != MPI_T_ERR_INVALID_NAME) errs++; - if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + errno = MPIX_T_pvar_get_index("AN INVALID PVAR NAME FOR TEST", MPI_T_PVAR_CLASS_COUNTER, &cvar_index); + if (errno != MPIX_T_ERR_INVALID_NAME) errs++; + if (errs) fprintf(stdout, "Errors found in MPIX_T_cvar_get_index\n"); - /* Test MPI_T_category_get_index with both valid and bogus names */ + /* Test MPIX_T_category_get_index with both valid and bogus names */ MPI_T_category_get_num(&num_cat); if (verbose) fprintf(stdout, "%d MPI_T categories\n", num_cat); for (i = 0; i < num_cat; i++) { namelen = sizeof(name); MPI_T_category_get_info(i, name, &namelen, NULL, NULL, NULL, NULL, NULL); if (namelen <= 128) { - errno = MPI_T_category_get_index(name, &cat_index); + errno = MPIX_T_category_get_index(name, &cat_index); if (errno != MPI_SUCCESS || cat_index != i) errs++; } } - errno = MPI_T_category_get_index("AN INVALID CATEGORY NAME FOR TEST", &cat_index); - if (errno != MPI_T_ERR_INVALID_NAME) errs++; - if (errs) fprintf(stdout, "Errors found in MPI_T_cvar_get_index\n"); + errno = MPIX_T_category_get_index("AN INVALID CATEGORY NAME FOR TEST", &cat_index); + if (errno != MPIX_T_ERR_INVALID_NAME) errs++; + if (errs) fprintf(stdout, "Errors found in MPIX_T_cvar_get_index\n"); MPI_T_finalize(); MPI_Finalize(); diff --git a/test/mpi/mpi_t/testlist b/test/mpi/mpi_t/testlist index 752709a..bded0d2 100644 --- a/test/mpi/mpi_t/testlist +++ b/test/mpi/mpi_t/testlist @@ -1,4 +1,4 @@ mpi_t_str 1 mpiversion=3.0 mpit_vars 1 mpiversion=3.0 cvarwrite 1 mpiversion=3.0 -getindex 1 mpiversion=3.1 +getindex 1 strict=false ----------------------------------------------------------------------- Summary of changes: src/include/mpi.h.in | 20 ++++++++++---------- src/include/mpishared.h | 2 +- src/mpi_t/cat_get_index.c | 30 +++++++++++++++--------------- src/mpi_t/cvar_get_index.c | 30 +++++++++++++++--------------- src/mpi_t/errnames.txt | 12 ++++++------ src/mpi_t/pvar_get_index.c | 32 ++++++++++++++++---------------- src/mpi_t/pvar_read.c | 7 ++++--- test/mpi/mpi_t/getindex.c | 32 ++++++++++++++++---------------- test/mpi/mpi_t/testlist | 2 +- 9 files changed, 84 insertions(+), 83 deletions(-) hooks/post-receive -- MPICH primary repository