Fix some attribute error detection problems reported by Lisandro
Dalcin. This commit was SVN r21941.
Этот коммит содержится в:
родитель
29bd7e5a53
Коммит
a211c55cce
@ -9,6 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -49,6 +50,10 @@ int MPI_Comm_get_attr(MPI_Comm comm, int comm_keyval,
|
||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
||||
if ((NULL == attribute_val) || (NULL == flag)) {
|
||||
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME);
|
||||
} else if (ompi_comm_invalid(comm)) {
|
||||
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_COMM, FUNC_NAME);
|
||||
} else if (MPI_KEYVAL_INVALID == comm_keyval) {
|
||||
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_KEYVAL, FUNC_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -57,6 +57,9 @@ int MPI_Type_get_attr (MPI_Datatype type,
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
|
||||
MPI_ERR_ARG,
|
||||
FUNC_NAME);
|
||||
} else if (MPI_KEYVAL_INVALID == type_keyval) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_KEYVAL,
|
||||
FUNC_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -48,6 +48,8 @@ int MPI_Win_get_attr(MPI_Win win, int win_keyval,
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_WIN, FUNC_NAME);
|
||||
} else if ((NULL == attribute_val) || (NULL == flag)) {
|
||||
return OMPI_ERRHANDLER_INVOKE(win, MPI_ERR_ARG, FUNC_NAME);
|
||||
} else if (MPI_KEYVAL_INVALID == win_keyval) {
|
||||
return OMPI_ERRHANDLER_INVOKE(win, MPI_ERR_KEYVAL, FUNC_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user