1
1
openmpi/ompi/mpi/tool/cvar_handle_alloc.c
Nathan Hjelm 1eb6ac5e80 mpit: update the return code check for mca_base_var_get
mca_base_var_get now can return OPAL_ERR_NOT_FOUND if a variable no
longer exists. This commit updates the return code check to ensure
the correct MPI_T error code is returned to the user.

cmr=v1.8.2:reviewer=jsquyres

This commit was SVN r32161.
2014-07-08 21:17:47 +00:00

75 строки
1.9 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 (c) 2014 Cisco Systems, Inc. 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_cvar_handle_alloc = PMPI_T_cvar_handle_alloc
#endif
#if OMPI_PROFILING_DEFINES
#include "ompi/mpi/tool/profile/defines.h"
#endif
int MPI_T_cvar_handle_alloc (int cvar_index, void *obj_handle,
MPI_T_cvar_handle *handle, int *count)
{
ompi_mpit_cvar_handle_t *new_handle;
int rc = MPI_SUCCESS;;
if (!mpit_is_initialized ()) {
return MPI_T_ERR_NOT_INITIALIZED;
}
if (MPI_PARAM_CHECK && (NULL == handle || NULL == count)) {
return MPI_ERR_ARG;
}
mpit_lock ();
*handle = NULL;
do {
new_handle = (ompi_mpit_cvar_handle_t *) malloc (sizeof (ompi_mpit_cvar_handle_t));
if (NULL == new_handle) {
rc = MPI_T_ERR_MEMORY;
break;
}
rc = mca_base_var_get(cvar_index, &new_handle->var);
if (OPAL_SUCCESS != rc) {
rc = (OPAL_ERR_VALUE_OUT_OF_BOUNDS == rc || OPAL_ERR_NOT_FOUND == rc) ? MPI_T_ERR_INVALID_INDEX:
MPI_ERR_OTHER;
free (new_handle);
break;
}
new_handle->bound_object = obj_handle;
if (MCA_BASE_VAR_TYPE_STRING == new_handle->var->mbv_type) {
/* Arbitrary string limit. Is there a better way to do this? */
*count = 2048;
} else {
/* MCA only supports a single integer at this time. Change me if
this assumption changes. */
*count = 1;
}
*handle = (MPI_T_cvar_handle) new_handle;
} while (0);
mpit_unlock ();
return rc;
}