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 8672503dc9dada489792c063dc8e6665cca0f47b (commit) via 77401b9511f55f8d2300fb217a2e2b8122b57832 (commit) via 422b06d25e39228d169fa3b18a8b8009f609597a (commit) from 3feca48f0a8d869e0dbe5d8155ce534c58a9a655 (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/8672503dc9dada489792c063dc8e6665cc... commit 8672503dc9dada489792c063dc8e6665cca0f47b Author: Wesley Bland <[email protected]> Date: Wed Dec 3 13:32:25 2014 -0600 Fix typo in error code man page No reviewer diff --git a/src/mpi/errhan/add_error_code.c b/src/mpi/errhan/add_error_code.c index 39b49ea..f32e383 100644 --- a/src/mpi/errhan/add_error_code.c +++ b/src/mpi/errhan/add_error_code.c @@ -32,7 +32,7 @@ int MPI_Add_error_code(int errorclass, int *errorcode) __attribute__((weak,alias #define FUNCNAME MPI_Add_error_code /*@ - MPI_Add_error_code - Add and MPI error code to an MPI error class + MPI_Add_error_code - Add an MPI error code to an MPI error class Input Parameters: . errorclass - Error class to add an error code. http://git.mpich.org/mpich.git/commitdiff/77401b9511f55f8d2300fb217a2e2b8122... commit 77401b9511f55f8d2300fb217a2e2b8122b57832 Author: James Dinan <[email protected]> Date: Thu Nov 20 08:27:49 2014 -0500 Add dynamic err code, predefined err class test Test for correct error class when a dynamic error code is created from a predefined error class. Signed-off-by: Wesley Bland <[email protected]> diff --git a/test/mpi/errhan/Makefile.am b/test/mpi/errhan/Makefile.am index 2d28fa9..2098592 100644 --- a/test/mpi/errhan/Makefile.am +++ b/test/mpi/errhan/Makefile.am @@ -19,7 +19,8 @@ noinst_PROGRAMS = \ commcall \ errfatal \ predef_eh \ - errstring2 + errstring2 \ + dynamic_errcode_predefined_errclass EXTRA_PROGRAMS = errcode errring errstring diff --git a/test/mpi/errhan/dynamic_errcode_predefined_errclass.c b/test/mpi/errhan/dynamic_errcode_predefined_errclass.c new file mode 100644 index 0000000..3fa1c9f --- /dev/null +++ b/test/mpi/errhan/dynamic_errcode_predefined_errclass.c @@ -0,0 +1,30 @@ +/* + * (C) 2006 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + * + * Portions of this code were written by Intel Corporation. + * Copyright (C) 2011-2012 Intel Corporation. Intel provides this material + * to Argonne National Laboratory subject to Software Grant and Corporate + * Contributor License Agreement dated February 8, 2012. + */ + +#include <stdio.h> +#include <mpi.h> + +int main(int argc, char **argv) { + int errcode, errclass; + + MPI_Init(&argc, &argv); + + MPI_Add_error_code(MPI_ERR_ARG, &errcode); + MPI_Error_class(errcode, &errclass); + + if (errclass != MPI_ERR_ARG) { + printf("ERROR: Got 0x%x, expected 0x%x\n", errclass, MPI_ERR_ARG); + } else { + printf( " No Errors\n" ); + } + + MPI_Finalize(); + return 0; +} diff --git a/test/mpi/errhan/testlist b/test/mpi/errhan/testlist index 8ddc826..ebd60ff 100644 --- a/test/mpi/errhan/testlist +++ b/test/mpi/errhan/testlist @@ -4,3 +4,4 @@ errfatal 1 resultTest=TestErrFatal predef_eh 1 predef_eh 2 errstring2 1 +dynamic_errcode_predefined_errclass 1 http://git.mpich.org/mpich.git/commitdiff/422b06d25e39228d169fa3b18a8b8009f6... commit 422b06d25e39228d169fa3b18a8b8009f609597a Author: James Dinan <[email protected]> Date: Thu Nov 20 08:20:18 2014 -0500 Fix error class buf in MPI_Error_add_code During error code creation, the error class was erroneously modified by applying ERROR_DYN_MASK when. The dynamic bit is already set for user-defined error classes, so this bug had no effect in all existing MPICH tests. However, when a predefined error class was passed during error code creation, it would be incorrectly marked as dynamic, resulting in an invalid result when the error class of a returned error code was returned via MPI_Error_class. Signed-off-by: Wesley Bland <[email protected]> diff --git a/src/mpi/errhan/dynerrutil.c b/src/mpi/errhan/dynerrutil.c index 8ac17af..0fb81cf 100644 --- a/src/mpi/errhan/dynerrutil.c +++ b/src/mpi/errhan/dynerrutil.c @@ -256,7 +256,7 @@ int MPIR_Err_add_code( int class ) /* --END ERROR HANDLING-- */ /* Create the full error code */ - new_code = class | ERROR_DYN_MASK | (new_code << ERROR_GENERIC_SHIFT); + new_code = class | (new_code << ERROR_GENERIC_SHIFT); /* FIXME: For robustness, we should make sure that the associated string is initialized to null */ ----------------------------------------------------------------------- Summary of changes: src/mpi/errhan/add_error_code.c | 2 +- src/mpi/errhan/dynerrutil.c | 2 +- test/mpi/errhan/Makefile.am | 3 +- .../errhan/dynamic_errcode_predefined_errclass.c | 30 ++++++++++++++++++++ test/mpi/errhan/testlist | 1 + 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 test/mpi/errhan/dynamic_errcode_predefined_errclass.c hooks/post-receive -- MPICH primary repository