dc532577db
add_error_class and add_error_code files. Also fixed the update of the lastusedcode attribute, all of work according to my tests pretty fine. Please note: the testcode attached to the bug 683 still reports some bugs. I am however pretty sure that the testcode is wrong at that points: - the standard says that the attribute MPI_LASTUSEDCODE has to be updated for a new error_class or a new error_code. The test currently assumes, that only the add_error_code call changes the attribute value. - you have to comment out the two lines 73 and 74 in order to make the test finish, since these lines check for the error string of non-existent codes. - line 126 the error-string of MPI_ERR_ARG is not "invalid argument" but a little bit more, so the test thinks the output is wrong. So probably the test has to be update to match the according error string of MPI_ERR_ARG. Fixes trac:682 This commit was SVN r12913. The following Trac tickets were found above: Ticket 682 --> https://svn.open-mpi.org/trac/ompi/ticket/682
65 строки
2.0 KiB
C
65 строки
2.0 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* Copyright (c) 2006 University of Houston. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
#include "ompi_config.h"
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "ompi/mpi/c/bindings.h"
|
|
#include "ompi/errhandler/errcode.h"
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
|
|
#pragma weak MPI_Add_error_string = PMPI_Add_error_string
|
|
#endif
|
|
|
|
#if OMPI_PROFILING_DEFINES
|
|
#include "ompi/mpi/c/profile/defines.h"
|
|
#endif
|
|
|
|
static const char FUNC_NAME[] = "MPI_Add_error_code";
|
|
|
|
|
|
int MPI_Add_error_string(int errorcode, char *string)
|
|
{
|
|
int rc;
|
|
|
|
if ( MPI_PARAM_CHECK ) {
|
|
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
|
|
if ( ompi_mpi_errcode_is_invalid(errorcode) )
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
|
|
FUNC_NAME);
|
|
|
|
if ( ompi_mpi_errcode_is_predefined(errorcode) )
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
|
|
FUNC_NAME);
|
|
|
|
if ( MPI_MAX_ERROR_STRING < (strlen(string)+1) )
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
|
|
FUNC_NAME);
|
|
}
|
|
|
|
rc = ompi_mpi_errnum_add_string (errorcode, string, (int)(strlen(string)+1));
|
|
if ( OMPI_SUCCESS != rc ) {
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN,
|
|
FUNC_NAME);
|
|
}
|
|
|
|
return MPI_SUCCESS;
|
|
}
|