260f1fd468
The C++ bindings were not tracking keyvals properly -- they were
freeing some internal meta data when Free_keyval() was called, not
when the keyval was actually destroyed (keyvals are refcounted in the
C layer, just like all other MPI objects, because they can live for
long after their corresponding Free call is invoked). This commit
fixes this problem and several other things:
* Add infrastructure on the ompi_attribute_keyval_t for an "extra"
destructor pointer that will be invoked during the "real"
constructor (i.e., when OBJ_RELEASE puts the refcount to 0). This
allows calling back into the C++ layer to release meta data
associated with the keyval.
* Adjust all cases where keyvals are created to pass in relevant
destructors (NULL or the C++ destructor).
* Do essentially the same for MPI::Comm, MPI::Win, and MPI:Datatype:
* Move several functions out of the .cc file into the _inln.h file
since they no longer require locks
* Make the 4 Create_keyval() functions call a common back-end
keyval creation function that does the Right Thing depending on
whether C or C++ function pointers were used for the keyval
functions. The back-end function does not call the corresponding
C MPI_*_create_keyval function, but rather does the work itself
so that it can associate a "destructor" callback for the C++
bindings for when the keyval is actually destroyed.
* Change a few type names to be more indicative of what they are
(mostly dealing with keyvals [not "keys"]).
* Add the 3 missing bindings for MPI::Comm::Create_keyval().
* Remove MPI::Comm::comm_map (and associated types) because it's no
longer necessary in the intercepts -- it was a by-product of being
a portable C++ bindings layer. Now we can just query the C layer
directly to figure out what type a communicator is. This solves
some logistics / callback issues, too.
* Rename several types, variables, and fix many comments in the
back-end C attribute implementation to make the names really
reflect what they are (keyvals vs. attributes). The previous names
heavily overloaded the name "key" and were ''extremely''
confusing.
This commit was SVN r13565.
The following Trac tickets were found above:
Ticket 817 --> https://svn.open-mpi.org/trac/ompi/ticket/817
95 строки
3.7 KiB
C
95 строки
3.7 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_KEYVAL_CREATE = mpi_keyval_create_f
|
|
#pragma weak pmpi_keyval_create = mpi_keyval_create_f
|
|
#pragma weak pmpi_keyval_create_ = mpi_keyval_create_f
|
|
#pragma weak pmpi_keyval_create__ = mpi_keyval_create_f
|
|
#elif OMPI_PROFILE_LAYER
|
|
OMPI_GENERATE_F77_BINDINGS (PMPI_KEYVAL_CREATE,
|
|
pmpi_keyval_create,
|
|
pmpi_keyval_create_,
|
|
pmpi_keyval_create__,
|
|
pmpi_keyval_create_f,
|
|
(ompi_mpi1_fortran_copy_attr_function* copy_fn, ompi_mpi1_fortran_delete_attr_function* delete_fn, MPI_Fint *keyval, MPI_Fint *extra_state, MPI_Fint *ierr),
|
|
(copy_fn, delete_fn, keyval, extra_state, ierr) )
|
|
#endif
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS
|
|
#pragma weak MPI_KEYVAL_CREATE = mpi_keyval_create_f
|
|
#pragma weak mpi_keyval_create = mpi_keyval_create_f
|
|
#pragma weak mpi_keyval_create_ = mpi_keyval_create_f
|
|
#pragma weak mpi_keyval_create__ = mpi_keyval_create_f
|
|
#endif
|
|
|
|
#if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
|
|
OMPI_GENERATE_F77_BINDINGS (MPI_KEYVAL_CREATE,
|
|
mpi_keyval_create,
|
|
mpi_keyval_create_,
|
|
mpi_keyval_create__,
|
|
mpi_keyval_create_f,
|
|
(ompi_mpi1_fortran_copy_attr_function* copy_fn, ompi_mpi1_fortran_delete_attr_function* delete_fn, MPI_Fint *keyval, MPI_Fint *extra_state, MPI_Fint *ierr),
|
|
(copy_fn, delete_fn, 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_keyval_create_f";
|
|
|
|
void mpi_keyval_create_f(ompi_mpi1_fortran_copy_attr_function* copy_attr_fn,
|
|
ompi_mpi1_fortran_delete_attr_function* delete_attr_fn,
|
|
MPI_Fint *keyval, MPI_Fint *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_mpi1_fortran_copy_fn = copy_attr_fn;
|
|
del_fn.attr_mpi1_fortran_delete_fn = delete_attr_fn;
|
|
|
|
/* Set the "F77_OLD" bit to denote that the callbacks should use
|
|
the old MPI-1 INTEGER-parameter functions (as opposed to the
|
|
new MPI-2 INTEGER(KIND=MPI_ADDRESS_KIND)-parameter
|
|
functions). */
|
|
|
|
ret = ompi_attr_create_keyval(COMM_ATTR, copy_fn, del_fn,
|
|
keyval, extra_state,
|
|
OMPI_KEYVAL_F77 | OMPI_KEYVAL_F77_MPI1,
|
|
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);
|
|
}
|
|
}
|