From 2611335eab149e30ca3a2d7d41fbfdd3d68b6591 Mon Sep 17 00:00:00 2001 From: Vishal Sahay Date: Tue, 1 Jun 2004 16:28:40 +0000 Subject: [PATCH] Change error handling code to takein proper object handle This commit was SVN r1178. --- src/mpi/c/type_create_keyval.c | 6 ++++-- src/mpi/c/type_delete_attr.c | 6 ++++-- src/mpi/c/type_free_keyval.c | 6 ++++-- src/mpi/c/type_get_attr.c | 6 ++++-- src/mpi/c/type_set_attr.c | 6 ++++-- src/mpi/c/win_delete_attr.c | 2 +- src/mpi/c/win_get_attr.c | 2 +- src/mpi/c/win_set_attr.c | 2 +- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/mpi/c/type_create_keyval.c b/src/mpi/c/type_create_keyval.c index f0ce186129..e0a2f69da4 100644 --- a/src/mpi/c/type_create_keyval.c +++ b/src/mpi/c/type_create_keyval.c @@ -31,7 +31,8 @@ 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(MPI_COMM_WORLD, MPI_ERR_ARG, + return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL, + MPI_ERR_ARG, FUNC_NAME); } } @@ -42,7 +43,8 @@ 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, MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME); + LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL, + MPI_ERR_OTHER, FUNC_NAME); } diff --git a/src/mpi/c/type_delete_attr.c b/src/mpi/c/type_delete_attr.c index 73620efc6f..f24afa5937 100644 --- a/src/mpi/c/type_delete_attr.c +++ b/src/mpi/c/type_delete_attr.c @@ -25,12 +25,14 @@ MPI_Type_delete_attr (MPI_Datatype type, int type_keyval) if (MPI_PARAM_CHECK) { if (MPI_DATATYPE_NULL == type) { - return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, + return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL, + MPI_ERR_TYPE, FUNC_NAME); } } ret = lam_attr_delete(TYPE_ATTR, type, type->d_keyhash, type_keyval, 0); - LAM_ERRHANDLER_RETURN(ret, type, MPI_ERR_OTHER, FUNC_NAME); + LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL, + MPI_ERR_OTHER, FUNC_NAME); } diff --git a/src/mpi/c/type_free_keyval.c b/src/mpi/c/type_free_keyval.c index 78ea73d94d..a52d185cce 100644 --- a/src/mpi/c/type_free_keyval.c +++ b/src/mpi/c/type_free_keyval.c @@ -27,12 +27,14 @@ MPI_Type_free_keyval(int *type_keyval) if (MPI_PARAM_CHECK) { if (NULL == type_keyval) { - return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, + return LAM_ERRHANDLER_INVOKE((lam_communicator_t *) NULL, + MPI_ERR_ARG, FUNC_NAME); } } ret = lam_attr_free_keyval(TYPE_ATTR, type_keyval, 0); - LAM_ERRHANDLER_RETURN(ret, MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME); + LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *)NULL, + MPI_ERR_OTHER, FUNC_NAME); } diff --git a/src/mpi/c/type_get_attr.c b/src/mpi/c/type_get_attr.c index d7cbe5b28a..c6265f8fe1 100644 --- a/src/mpi/c/type_get_attr.c +++ b/src/mpi/c/type_get_attr.c @@ -28,7 +28,8 @@ MPI_Type_get_attr (MPI_Datatype type, if (MPI_PARAM_CHECK) { if ((NULL == attribute_val) || (NULL == flag)) { - return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, + return LAM_ERRHANDLER_INVOKE((lam_communicator_t *) NULL, + MPI_ERR_ARG, FUNC_NAME); } } @@ -36,5 +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, type, MPI_ERR_OTHER, FUNC_NAME); + LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *) NULL, + MPI_ERR_OTHER, FUNC_NAME); } diff --git a/src/mpi/c/type_set_attr.c b/src/mpi/c/type_set_attr.c index fe772ac3e2..c3f7c58d14 100644 --- a/src/mpi/c/type_set_attr.c +++ b/src/mpi/c/type_set_attr.c @@ -27,7 +27,8 @@ MPI_Type_set_attr (MPI_Datatype type, if (MPI_PARAM_CHECK) { if (MPI_DATATYPE_NULL == type) { - return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, + return LAM_ERRHANDLER_INVOKE((lam_communicator_t *)NULL, + MPI_ERR_TYPE, FUNC_NAME); } } @@ -35,6 +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, type, MPI_ERR_OTHER, FUNC_NAME); + LAM_ERRHANDLER_RETURN(ret, (lam_communicator_t *) NULL, + MPI_ERR_OTHER, FUNC_NAME); } diff --git a/src/mpi/c/win_delete_attr.c b/src/mpi/c/win_delete_attr.c index 62560ebbef..42b72c1474 100644 --- a/src/mpi/c/win_delete_attr.c +++ b/src/mpi/c/win_delete_attr.c @@ -24,7 +24,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) if (MPI_PARAM_CHECK) { if (MPI_WIN_NULL == win) { - return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_WIN, + return LAM_ERRHANDLER_INVOKE(win, MPI_ERR_WIN, FUNC_NAME); } } diff --git a/src/mpi/c/win_get_attr.c b/src/mpi/c/win_get_attr.c index 1260183a90..acd222fac1 100644 --- a/src/mpi/c/win_get_attr.c +++ b/src/mpi/c/win_get_attr.c @@ -24,7 +24,7 @@ int MPI_Win_get_attr(MPI_Win win, int win_keyval, if (MPI_PARAM_CHECK) { if ((NULL == attribute_val) || (NULL == flag)) { - return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, + return LAM_ERRHANDLER_INVOKE(win, MPI_ERR_ARG, FUNC_NAME); } } diff --git a/src/mpi/c/win_set_attr.c b/src/mpi/c/win_set_attr.c index ebea505258..1dcf950c9d 100644 --- a/src/mpi/c/win_set_attr.c +++ b/src/mpi/c/win_set_attr.c @@ -24,7 +24,7 @@ int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val) { if (MPI_PARAM_CHECK) { if (MPI_WIN_NULL == win) { - return LAM_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_WIN, + return LAM_ERRHANDLER_INVOKE(win, MPI_ERR_WIN, FUNC_NAME); } }