0a24eadaad
The EXTRA_STATE parameter is passed by reference, and thus should be dereferenced before it is stored. Similarly, the stored value should be passed by reference to the copy and delete routines. This fixes trac:1864. This commit was SVN r20926. The following Trac tickets were found above: Ticket 1864 --> https://svn.open-mpi.org/trac/ompi/ticket/1864
94 строки
4.0 KiB
C
94 строки
4.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) 2007 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include "ompi/mpi/f77/bindings.h"
|
|
#include "ompi/communicator/communicator.h"
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
|
|
#pragma weak PMPI_COMM_CREATE_KEYVAL = mpi_comm_create_keyval_f
|
|
#pragma weak pmpi_comm_create_keyval = mpi_comm_create_keyval_f
|
|
#pragma weak pmpi_comm_create_keyval_ = mpi_comm_create_keyval_f
|
|
#pragma weak pmpi_comm_create_keyval__ = mpi_comm_create_keyval_f
|
|
#elif OMPI_PROFILE_LAYER
|
|
OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_CREATE_KEYVAL,
|
|
pmpi_comm_create_keyval,
|
|
pmpi_comm_create_keyval_,
|
|
pmpi_comm_create_keyval__,
|
|
pmpi_comm_create_keyval_f,
|
|
(ompi_mpi2_fortran_copy_attr_function* comm_copy_attr_fn, ompi_mpi2_fortran_delete_attr_function* comm_delete_attr_fn, MPI_Fint *comm_keyval, MPI_Aint *extra_state, MPI_Fint *ierr),
|
|
(comm_copy_attr_fn, comm_delete_attr_fn, comm_keyval, extra_state, ierr) )
|
|
#endif
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS
|
|
#pragma weak MPI_COMM_CREATE_KEYVAL = mpi_comm_create_keyval_f
|
|
#pragma weak mpi_comm_create_keyval = mpi_comm_create_keyval_f
|
|
#pragma weak mpi_comm_create_keyval_ = mpi_comm_create_keyval_f
|
|
#pragma weak mpi_comm_create_keyval__ = mpi_comm_create_keyval_f
|
|
#endif
|
|
|
|
#if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
|
|
OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_KEYVAL,
|
|
mpi_comm_create_keyval,
|
|
mpi_comm_create_keyval_,
|
|
mpi_comm_create_keyval__,
|
|
mpi_comm_create_keyval_f,
|
|
(ompi_mpi2_fortran_copy_attr_function* comm_copy_attr_fn, ompi_mpi2_fortran_delete_attr_function* comm_delete_attr_fn, MPI_Fint *comm_keyval, MPI_Aint *extra_state, MPI_Fint *ierr),
|
|
(comm_copy_attr_fn, comm_delete_attr_fn, comm_keyval, extra_state, ierr) )
|
|
#endif
|
|
|
|
|
|
#if OMPI_PROFILE_LAYER && ! OMPI_HAVE_WEAK_SYMBOLS
|
|
#include "ompi/mpi/f77/profile/defines.h"
|
|
#endif
|
|
|
|
static const char FUNC_NAME[] = "MPI_Comm_create_keyval_f";
|
|
|
|
void mpi_comm_create_keyval_f(ompi_mpi2_fortran_copy_attr_function* comm_copy_attr_fn,
|
|
ompi_mpi2_fortran_delete_attr_function* comm_delete_attr_fn,
|
|
MPI_Fint *comm_keyval,
|
|
MPI_Aint *extra_state, MPI_Fint *ierr)
|
|
{
|
|
int ret, c_err;
|
|
ompi_attribute_fn_ptr_union_t copy_fn;
|
|
ompi_attribute_fn_ptr_union_t del_fn;
|
|
|
|
copy_fn.attr_mpi2_fortran_copy_fn = comm_copy_attr_fn;
|
|
del_fn.attr_mpi2_fortran_delete_fn = comm_delete_attr_fn;
|
|
|
|
/* Note that we only set the "F77" bit and exclude the "F77_OLD"
|
|
bit, indicating that the callbacks should use the new MPI-2
|
|
INTEGER(KIND=MPI_ADDRESS_KIND)-parameter functions (as opposed
|
|
to the old MPI-1 INTEGER-parameter functions). */
|
|
|
|
ret = ompi_attr_create_keyval(COMM_ATTR, copy_fn, del_fn,
|
|
comm_keyval, (void*)*extra_state, OMPI_KEYVAL_F77,
|
|
NULL);
|
|
|
|
if (MPI_SUCCESS != ret) {
|
|
c_err = OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
|
|
MPI_ERR_OTHER,
|
|
FUNC_NAME)
|
|
*ierr = OMPI_INT_2_FINT(c_err);
|
|
} else {
|
|
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
|
|
}
|
|
}
|