d34a4300b8
Fixes: - Segmentation fault when using watermark variables. - Segmentation fault when using a handle bound to a no longer valid performance variable. - Incorrect return codes from MPI_T_pvar_* functions. cmr=v1.7.4:reviewer=jsquyres This commit was SVN r29481.
59 строки
1.6 KiB
C
59 строки
1.6 KiB
C
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
|
/*
|
|
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
|
|
* reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi/mpi/tool/mpit-internal.h"
|
|
|
|
#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
|
|
#pragma weak MPI_T_pvar_handle_alloc = PMPI_T_pvar_handle_alloc
|
|
#endif
|
|
|
|
#if OMPI_PROFILING_DEFINES
|
|
#include "ompi/mpi/tool/profile/defines.h"
|
|
#endif
|
|
|
|
static const char FUNC_NAME[] = "MPI_T_pvar_handle_alloc";
|
|
|
|
int MPI_T_pvar_handle_alloc(MPI_T_pvar_session session, int pvar_index,
|
|
void *obj_handle, MPI_T_pvar_handle *handle, int *count)
|
|
{
|
|
const mca_base_pvar_t *pvar;
|
|
int ret;
|
|
|
|
if (!mpit_is_initialized ()) {
|
|
return MPI_T_ERR_NOT_INITIALIZED;
|
|
}
|
|
|
|
mpit_lock ();
|
|
|
|
do {
|
|
/* Find the performance variable. mca_base_pvar_get() handles the
|
|
bounds checking. */
|
|
ret = mca_base_pvar_get (pvar_index, &pvar);
|
|
if (OMPI_SUCCESS != ret) {
|
|
break;
|
|
}
|
|
|
|
/* Check the variable binding is something sane */
|
|
if (pvar->bind > MPI_T_BIND_MPI_INFO || pvar->bind < MPI_T_BIND_NO_OBJECT) {
|
|
/* This variable specified an invalid binding (not an MPI object). */
|
|
ret = MPI_T_ERR_INVALID_INDEX;
|
|
break;
|
|
}
|
|
|
|
ret = mca_base_pvar_handle_alloc (session, pvar_index, obj_handle,
|
|
handle, count);
|
|
} while (0);
|
|
|
|
mpit_unlock ();
|
|
|
|
return ompit_opal_to_mpit_error(ret);
|
|
}
|