philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFFV-10544 Improve JNI exception handling

Browse Source
This commit is contained in:
Allen Byrne
2018-08-06 13:15:50 -05:00
parent 51a5d112ad
commit 78c4623235
9 changed files with 123 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
View File

@@ -30,6 +30,9 @@ import hdf.hdf5lib.HDF5Constants;
@SuppressWarnings("serial")
public class HDF5LibraryException extends HDF5Exception {
private final long majorErrorNumber;
private final long minorErrorNumber;
/**
* Constructs an <code>HDF5LibraryException</code> with no specified detail
* message.
@@ -44,9 +47,10 @@ public class HDF5LibraryException extends HDF5Exception {
}
catch (Exception e) {
}
;
detailMessage = getMinorError(getMinorErrorNumber());
this.majorErrorNumber = _getMajorErrorNumber();
this.minorErrorNumber = _getMinorErrorNumber();
detailMessage = getMinorError(minorErrorNumber);
}
/**
@@ -65,7 +69,8 @@ public class HDF5LibraryException extends HDF5Exception {
}
catch (Exception e) {
}
;
this.majorErrorNumber = _getMajorErrorNumber();
this.minorErrorNumber = _getMinorErrorNumber();
}
/**
@@ -74,7 +79,11 @@ public class HDF5LibraryException extends HDF5Exception {
*
* @return the major error number
*/
public native long getMajorErrorNumber();
public long getMajorErrorNumber()
{
return majorErrorNumber;
}
private native long _getMajorErrorNumber();
/**
* Get the minor error number of the first error on the HDF5 library error
@@ -82,7 +91,11 @@ public class HDF5LibraryException extends HDF5Exception {
*
* @return the minor error number
*/
public native long getMinorErrorNumber();
public long getMinorErrorNumber()
{
return minorErrorNumber;
}
private native long _getMinorErrorNumber();
/**
* Return a error message for the minor error number.

19
java/src/jni/exceptionImp.c
View File

@@ -83,11 +83,16 @@ typedef struct H5E_num_t {
} \
jm = ENVPTR->GetMethodID(ENVPAR jc, "<init>", "(Ljava/lang/String;)V"); \
if (jm == NULL) { \
printf("THROWEXCEPTION FATAL ERROR: GetMethodID failed\n"); \
return JNI_FALSE; \
} \
ex = ENVPTR->NewObjectA (ENVPAR jc, jm, (jvalue*)(args)); \
if (ex == NULL) { \
printf("THROWEXCEPTION FATAL ERROR: %s: Creation failed\n", (className)); \
return JNI_FALSE; \
} \
if (ENVPTR->Throw(ENVPAR (jthrowable)ex) < 0) { \
printf("FATAL ERROR: %s: Throw failed\n", (className)); \
printf("THROWEXCEPTION FATAL ERROR: %s: Throw failed\n", (className)); \
return JNI_FALSE; \
} \
return JNI_TRUE; \
@@ -174,13 +179,13 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0
/*
* Class: hdf_hdf5lib_exceptions_HDFLibraryException
* Method: getMajorErrorNumber
* Method: _getMajorErrorNumber
* Signature: ()J
*
* Extract the HDF-5 major error number from the HDF-5 error stack.
*/
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMajorErrorNumber
Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber
(JNIEnv *env, jobject obj)
{
H5E_num_t err_nums;
@@ -190,17 +195,17 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMajorErrorNumber
H5Ewalk2(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, &err_nums);
return err_nums.maj_num;
} /* end Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMajorErrorNumber() */
} /* end Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber() */
/*
* Class: hdf_hdf5lib_exceptions_HDFLibraryException
* Method: getMinorErrorNumber
* Method: _getMinorErrorNumber
* Signature: ()J
*
* Extract the HDF-5 minor error number from the HDF-5 error stack.
*/
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMinorErrorNumber
Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber
(JNIEnv *env, jobject obj)
{
H5E_num_t err_nums;
@@ -210,7 +215,7 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMinorErrorNumber
H5Ewalk2(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, &err_nums);
return err_nums.min_num;
} /* end Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMinorErrorNumber() */
} /* end Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber() */
/*
* Routine to raise particular Java exceptions from C

8
java/src/jni/exceptionImp.h
View File

@@ -55,20 +55,20 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0
/*
* Class: hdf_hdf5lib_exceptions_HDFLibraryException
* Method: getMajorErrorNumber
* Method: _getMajorErrorNumber
* Signature: ()J
*/
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMajorErrorNumber
Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber
(JNIEnv *env, jobject obj);
/*
* Class: hdf_hdf5lib_exceptions_HDFLibraryException
* Method: getMinorErrorNumber
* Method: _getMinorErrorNumber
* Signature: ()J
*/
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMinorErrorNumber
Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber
(JNIEnv *env, jobject obj);
#ifdef __cplusplus

12
java/src/jni/h5aImp.c
View File

@@ -966,7 +966,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1idx
UNPIN_JAVA_STRING(obj_name, aName);
if (status < 0) {
h5libraryError(env);
h5libraryError(env);
} /* end if */
else {
args[0].z = ainfo.corder_valid;
@@ -1002,7 +1002,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1name
UNPIN_JAVA_STRING_TWO(obj_name, aName, attr_name, attrName);
if (status < 0) {
h5libraryError(env);
h5libraryError(env);
} /* end if */
else {
args[0].z = ainfo.corder_valid;
@@ -1166,8 +1166,12 @@ H5A_iterate_cb
constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(ZJIJ)V");
if (constructor != 0) {
cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
if (cb_info_t == NULL) {
printf("FATAL ERROR: hdf/hdf5lib/structs/H5A_info_t: Creation failed\n");
}
else {
status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
}
} /* end if (constructor != 0) */
} /* end if (cls != 0) */
} /* end if (mid != 0) */

8
java/src/jni/h5dImp.c
View File

@@ -1343,7 +1343,7 @@ Java_hdf_hdf5lib_H5_H5DwriteVL
htri_t isVlenStr = 0;
htri_t isComplex = 0;
if (buf == NULL) {
if (buf == NULL) {
h5nullArgument(env, "H5DwriteVL: buf is NULL");
} /* end if */
else {
@@ -1362,14 +1362,10 @@ Java_hdf_hdf5lib_H5_H5DwriteVL
isVlenStr = 1; /* strings created by H5Tvlen_create(H5T_C_S1) */
}
if (isStr == 0 || isComplex>0 || isVlenStr) {
h5unimplemented(env, "H5DwriteVL: VL types, which are not string type, not implemented");
status = -1;
#ifdef notdef
status = H5DwriteVL_asstr(env, (hid_t)dataset_id, (hid_t)mem_type_id,
(hid_t)mem_space_id, (hid_t)file_space_id,
(hid_t)xfer_plist_id, buf);
#endif
}
}
else if (isStr > 0) {
status = H5DwriteVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id,
(hid_t)mem_space_id, (hid_t)file_space_id,

8
java/src/jni/h5eImp.c
View File

@@ -508,8 +508,12 @@ H5E_walk_cb
constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJJILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
if (constructor != 0) {
cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, nindx, cb_info_t, op_data);
if (cb_info_t == NULL) {
printf("FATAL ERROR: hdf/hdf5lib/structs/H5E_error2_t: Creation failed\n");
}
else {
status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, nindx, cb_info_t, op_data);
}
} /* end if (constructor != 0) */
} /* end if(cls != 0) */
} /* end if (mid != 0) */

8
java/src/jni/h5lImp.c
View File

@@ -574,8 +574,12 @@ H5L_iterate_cb
constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(IZJIJ)V");
if (constructor != 0) {
cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
if (cb_info_t == NULL) {
printf("FATAL ERROR: hdf/hdf5lib/structs/H5L_info_t: Creation failed\n");
}
else {
status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
}
} /* end if */
} /* end if */
} /* end if */

87
java/src/jni/h5oImp.c
View File

@@ -372,41 +372,58 @@ H5O_iterate_cb
constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(IIIIJJJJJJ)V");
if (constructor != 0) {
hdrinfobuf = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
args[0].j = (jlong)info->meta_size.obj.index_size;
args[1].j = (jlong)info->meta_size.obj.heap_size;
// get a reference to the H5_ih_info_t class
cls = CBENVPTR->FindClass(CBENVPAR "hdf/hdf5lib/structs/H5_ih_info_t");
if (cls != 0) {
// get a reference to the constructor; the name is <init>
constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJ)V");
if (constructor != 0) {
ihinfobuf1 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
args[0].j = (jlong)info->meta_size.attr.index_size;
args[1].j = (jlong)info->meta_size.attr.heap_size;
ihinfobuf2 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
args[0].j = (jlong)info->fileno;
args[1].j = (jlong)info->addr;
args[2].i = info->type;
args[3].i = (jint)info->rc;
args[4].j = (jlong)info->num_attrs;
args[5].j = info->atime;
args[6].j = info->mtime;
args[7].j = info->ctime;
args[8].j = info->btime;
args[9].l = hdrinfobuf;
args[10].l = ihinfobuf1;
args[11].l = ihinfobuf2;
// get a reference to the H5O_info_t class
cls = CBENVPTR->FindClass(CBENVPAR "hdf/hdf5lib/structs/H5O_info_t");
if (cls != 0) {
// get a reference to the constructor; the name is <init>
constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJIIJJJJJLhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;)V");
if (constructor != 0) {
cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
if (hdrinfobuf == NULL) {
printf("H5O_iterate_cb ERROR: hdf/hdf5lib/structs/H5O_hdr_info_t: Creation failed\n");
}
else {
args[0].j = (jlong)info->meta_size.obj.index_size;
args[1].j = (jlong)info->meta_size.obj.heap_size;
// get a reference to the H5_ih_info_t class
cls = CBENVPTR->FindClass(CBENVPAR "hdf/hdf5lib/structs/H5_ih_info_t");
if (cls != 0) {
// get a reference to the constructor; the name is <init>
constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJ)V");
if (constructor != 0) {
ihinfobuf1 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
if (ihinfobuf1 == NULL) {
printf("H5O_iterate_cb ERROR: hdf/hdf5lib/structs/H5_ih_info_t: Creation failed\n");
}
else {
args[0].j = (jlong)info->meta_size.attr.index_size;
args[1].j = (jlong)info->meta_size.attr.heap_size;
ihinfobuf2 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
if (ihinfobuf2 == NULL) {
printf("H5O_iterate_cb ERROR: hdf/hdf5lib/structs/H5_ih_info_t: Creation failed\n");
}
else {
args[0].j = (jlong)info->fileno;
args[1].j = (jlong)info->addr;
args[2].i = info->type;
args[3].i = (jint)info->rc;
args[4].j = (jlong)info->num_attrs;
args[5].j = info->atime;
args[6].j = info->mtime;
args[7].j = info->ctime;
args[8].j = info->btime;
args[9].l = hdrinfobuf;
args[10].l = ihinfobuf1;
args[11].l = ihinfobuf2;
// get a reference to the H5O_info_t class
cls = CBENVPTR->FindClass(CBENVPAR "hdf/hdf5lib/structs/H5O_info_t");
if (cls != 0) {
// get a reference to the constructor; the name is <init>
constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJIIJJJJJLhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;)V");
if (constructor != 0) {
cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
if (cb_info_t == NULL) {
printf("H5O_iterate_cb ERROR: hdf/hdf5lib/structs/H5O_info_t: Creation failed\n");
}
else {
status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
}
}
}
}
}
}
}