Set errhandlers to have MPI_COMM_WORLD instead of NULL, since lam_errhandler_invoke does not handle NULL to substitute it to MPI_COMM_WORLD. We want MCW here because we want to distinguish between errhandlers called before/after/between MCW was init/destroyed
This commit was SVN r1180.
Этот коммит содержится в:
родитель
539c5442d3
Коммит
a82fc3ff5a
@ -31,7 +31,7 @@ MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn,
|
||||
if (MPI_PARAM_CHECK) {
|
||||
if ((NULL == type_copy_attr_fn) || (NULL == type_delete_attr_fn) ||
|
||||
(NULL == type_keyval)) {
|
||||
return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL,
|
||||
return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
|
||||
MPI_ERR_ARG,
|
||||
FUNC_NAME);
|
||||
}
|
||||
@ -43,7 +43,7 @@ MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn,
|
||||
ret = lam_attr_create_keyval(TYPE_ATTR, copy_fn, del_fn,
|
||||
type_keyval, extra_state, 0);
|
||||
|
||||
LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL,
|
||||
LAM_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD,
|
||||
MPI_ERR_OTHER, FUNC_NAME);
|
||||
}
|
||||
|
||||
|
@ -25,7 +25,7 @@ MPI_Type_delete_attr (MPI_Datatype type, int type_keyval)
|
||||
|
||||
if (MPI_PARAM_CHECK) {
|
||||
if (MPI_DATATYPE_NULL == type) {
|
||||
return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL,
|
||||
return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
|
||||
MPI_ERR_TYPE,
|
||||
FUNC_NAME);
|
||||
}
|
||||
@ -33,6 +33,6 @@ MPI_Type_delete_attr (MPI_Datatype type, int type_keyval)
|
||||
|
||||
ret = lam_attr_delete(TYPE_ATTR, type, type->d_keyhash, type_keyval, 0);
|
||||
|
||||
LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL,
|
||||
LAM_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD,
|
||||
MPI_ERR_OTHER, FUNC_NAME);
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ MPI_Type_free_keyval(int *type_keyval)
|
||||
|
||||
if (MPI_PARAM_CHECK) {
|
||||
if (NULL == type_keyval) {
|
||||
return LAM_ERRHANDLER_INVOKE((lam_communicator_t *) NULL,
|
||||
return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
|
||||
MPI_ERR_ARG,
|
||||
FUNC_NAME);
|
||||
}
|
||||
@ -35,6 +35,6 @@ MPI_Type_free_keyval(int *type_keyval)
|
||||
|
||||
ret = lam_attr_free_keyval(TYPE_ATTR, type_keyval, 0);
|
||||
|
||||
LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL,
|
||||
LAM_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD,
|
||||
MPI_ERR_OTHER, FUNC_NAME);
|
||||
}
|
||||
|
@ -28,7 +28,7 @@ MPI_Type_get_attr (MPI_Datatype type,
|
||||
|
||||
if (MPI_PARAM_CHECK) {
|
||||
if ((NULL == attribute_val) || (NULL == flag)) {
|
||||
return LAM_ERRHANDLER_INVOKE((lam_communicator_t *) NULL,
|
||||
return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
|
||||
MPI_ERR_ARG,
|
||||
FUNC_NAME);
|
||||
}
|
||||
@ -37,6 +37,6 @@ MPI_Type_get_attr (MPI_Datatype type,
|
||||
ret = lam_attr_get(type->d_keyhash, type_keyval,
|
||||
attribute_val, flag);
|
||||
|
||||
LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *) NULL,
|
||||
LAM_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD,
|
||||
MPI_ERR_OTHER, FUNC_NAME);
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ MPI_Type_set_attr (MPI_Datatype type,
|
||||
|
||||
if (MPI_PARAM_CHECK) {
|
||||
if (MPI_DATATYPE_NULL == type) {
|
||||
return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL,
|
||||
return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
|
||||
MPI_ERR_TYPE,
|
||||
FUNC_NAME);
|
||||
}
|
||||
@ -36,7 +36,7 @@ MPI_Type_set_attr (MPI_Datatype type,
|
||||
ret = lam_attr_set(TYPE_ATTR, type, type->d_keyhash,
|
||||
type_keyval, attribute_val, 0);
|
||||
|
||||
LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *) NULL,
|
||||
LAM_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD,
|
||||
MPI_ERR_OTHER, FUNC_NAME);
|
||||
|
||||
}
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user