Skip to content

Error handling improvements #2063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2016
Merged

Error handling improvements #2063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions ompi/mpi/java/c/mpi_Comm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -205,7 +207,10 @@ JNIEXPORT jlongArray JNICALL Java_mpi_Comm_iDup(
MPI_Comm newcomm;
MPI_Request request;
int rc = MPI_Comm_idup((MPI_Comm)comm, &newcomm, &request);
ompi_java_exceptionCheck(env, rc);

if(ompi_java_exceptionCheck(env, rc))
return NULL;

jlongArray jcr = (*env)->NewLongArray(env, 2);
jlong *cr = (jlong*)(*env)->GetPrimitiveArrayCritical(env, jcr, NULL);
cr[0] = (jlong)newcomm;
Expand Down Expand Up @@ -332,6 +337,7 @@ JNIEXPORT void JNICALL Java_mpi_Comm_recv(
jobject buf, jboolean db, jint offset, jint count,
jlong jType, jint bType, jint source, jint tag, jlongArray jStatus)
{
jboolean exception;
MPI_Comm comm = (MPI_Comm)jComm;
MPI_Datatype type = (MPI_Datatype)jType;

Expand All @@ -341,10 +347,12 @@ JNIEXPORT void JNICALL Java_mpi_Comm_recv(

MPI_Status status;
int rc = MPI_Recv(ptr, count, type, source, tag, comm, &status);
ompi_java_exceptionCheck(env, rc);
exception = ompi_java_exceptionCheck(env, rc);

ompi_java_releaseWritePtr(ptr,item,env,buf,db,offset,count,type,bType);
ompi_java_status_set(env, jStatus, &status);

if(!exception)
ompi_java_status_set(env, jStatus, &status);
}

JNIEXPORT void JNICALL Java_mpi_Comm_sendRecv(
Expand All @@ -355,6 +363,7 @@ JNIEXPORT void JNICALL Java_mpi_Comm_sendRecv(
jlong rjType, jint rBType, jint source, jint rTag,
jlongArray jStatus)
{
jboolean exception;
MPI_Comm comm = (MPI_Comm)jComm;
MPI_Datatype sType = (MPI_Datatype)sjType;
MPI_Datatype rType = (MPI_Datatype)rjType;
Expand All @@ -369,10 +378,12 @@ JNIEXPORT void JNICALL Java_mpi_Comm_sendRecv(
int rc = MPI_Sendrecv(sPtr, sCount, sType, dest, sTag,
rPtr, rCount, rType, source, rTag, comm, &status);

ompi_java_exceptionCheck(env, rc);
exception = ompi_java_exceptionCheck(env, rc);
ompi_java_releaseReadPtr(sPtr, sItem, sBuf, sdb);
ompi_java_releaseWritePtr(rPtr,rItem,env,rBuf,rdb,rOff,rCount,rType,rBType);
ompi_java_status_set(env, jStatus, &status);

if(!exception)
ompi_java_status_set(env, jStatus, &status);
}

JNIEXPORT void JNICALL Java_mpi_Comm_sendRecvReplace(
Expand All @@ -392,8 +403,9 @@ JNIEXPORT void JNICALL Java_mpi_Comm_sendRecvReplace(
int rc = MPI_Sendrecv_replace(ptr, count, type, dest,
sTag, source, rTag, comm, &status);

ompi_java_exceptionCheck(env, rc);
ompi_java_status_set(env, jStatus, &status);
if(!ompi_java_exceptionCheck(env, rc))
ompi_java_status_set(env, jStatus, &status);

ompi_java_releaseWritePtr(ptr,item,env,buf,db,offset,count,type,bType);
}

Expand Down Expand Up @@ -662,8 +674,9 @@ JNIEXPORT void JNICALL Java_mpi_Comm_probe(
{
MPI_Status status;
int rc = MPI_Probe(source, tag, (MPI_Comm)comm, &status);
ompi_java_exceptionCheck(env, rc);
ompi_java_status_set(env, jStatus, &status);

if(!ompi_java_exceptionCheck(env, rc))
ompi_java_status_set(env, jStatus, &status);
}

JNIEXPORT jint JNICALL Java_mpi_Comm_getTopology(
Expand Down
8 changes: 6 additions & 2 deletions ompi/mpi/java/c/mpi_Datatype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -92,7 +94,8 @@ JNIEXPORT void JNICALL Java_mpi_Datatype_getLbExtent(
{
MPI_Aint lb, extent;
int rc = MPI_Type_get_extent((MPI_Datatype)type, &lb, &extent);
ompi_java_exceptionCheck(env, rc);
if(ompi_java_exceptionCheck(env, rc))
return;

jint *lbExt = (*env)->GetIntArrayElements(env, jLbExt, NULL);
lbExt[0] = (jint)lb;
Expand All @@ -105,7 +108,8 @@ JNIEXPORT void JNICALL Java_mpi_Datatype_getTrueLbExtent(
{
MPI_Aint lb, extent;
int rc = MPI_Type_get_true_extent((MPI_Datatype)type, &lb, &extent);
ompi_java_exceptionCheck(env, rc);
if(ompi_java_exceptionCheck(env, rc))
return;

jint *lbExt = (*env)->GetIntArrayElements(env, jLbExt, NULL);
lbExt[0] = (jint)lb;
Expand Down
Loading