327576b2a3
passed to MPI_COMM_FREE, it invoked the error handler on MPI_COMM_WORLD, not on MPI_COMM_FREE. This commit changes the behavior: if MPI_COMM_SELF is passed to MPI_COMM_FREE, we invoke the error handler on MPI_COMM_SELF (not MPI_COMM_WORLD). Fixes trac:1109. This commit was SVN r15682. The following Trac tickets were found above: Ticket 1109 --> https://svn.open-mpi.org/trac/ompi/ticket/1109
58 строки
1.7 KiB
C
58 строки
1.7 KiB
C
/*
|
|
* Copyright (c) 2004-2007 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$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
#include "ompi_config.h"
|
|
#include <stdio.h>
|
|
|
|
#include "ompi/mpi/c/bindings.h"
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
|
|
#pragma weak MPI_Comm_free = PMPI_Comm_free
|
|
#endif
|
|
|
|
#if OMPI_PROFILING_DEFINES
|
|
#include "ompi/mpi/c/profile/defines.h"
|
|
#endif
|
|
|
|
static const char FUNC_NAME[] = "MPI_Comm_free";
|
|
|
|
|
|
int MPI_Comm_free(MPI_Comm *comm)
|
|
{
|
|
int ret;
|
|
|
|
OPAL_CR_TEST_CHECKPOINT_READY();
|
|
|
|
if ( MPI_PARAM_CHECK ) {
|
|
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
|
|
if ( NULL == *comm || MPI_COMM_WORLD == *comm ||
|
|
ompi_comm_invalid (*comm)) {
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COMM,
|
|
FUNC_NAME);
|
|
} else if (MPI_COMM_SELF == *comm) {
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_SELF, MPI_ERR_COMM,
|
|
FUNC_NAME);
|
|
}
|
|
}
|
|
|
|
ret = ompi_comm_free ( comm );
|
|
OMPI_ERRHANDLER_CHECK(ret, *comm, ret, FUNC_NAME);
|
|
|
|
return MPI_SUCCESS;
|
|
}
|