mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add some Java methods that were missed earlier.

Browse Source
This commit is contained in:
Quincey Koziol 2016-11-30 15:12:35 -08:00
parent 5922bbb45f
commit 65be68a17d
7 changed files with 314 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
java/src/hdf/hdf5lib/H5.java
View File

@ -2852,6 +2852,26 @@ public class H5 implements java.io.Serializable {
**/
public synchronized static native void H5Fclear_elink_file_cache(long file_id) throws HDF5LibraryException;
/**
* H5Fget_mdc_logging_status gets the current metadata cache logging status.
*
* @param file_id
* IN: Identifier of the target file.
*
* @param mdc_logging_status, the status
* mdc_logging_status[0] = is_enabled, whether logging is enabled
* mdc_logging_status[1] = is_currently_logging, whether events are currently being logged
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
* @exception NullPointerException
* - mdc_logging_status is null.
**/
public synchronized static native void H5Fget_mdc_logging_status(long file_id, boolean[] mdc_logging_status)
throws HDF5LibraryException, NullPointerException;
// /////// unimplemented ////////
// ssize_t H5Fget_file_image(hid_t file_id, void * buf_ptr, size_t buf_len);
// herr_t H5Fget_metadata_read_retry_info(hid_t file_id, H5F_retry_info_t *info);
@ -5674,6 +5694,44 @@ public class H5 implements java.io.Serializable {
throws HDF5LibraryException;
/**
* H5Pset_mdc_log_options sets metadata cache logging options.
*
* @param fapl_id
* IN: File access property list identifier
* @param is_enabled
* IN: Whether logging is enabled.
* @param location
* IN: Location of log in UTF-8/ASCII (file path/name) (On Windows, this must be ASCII).
* @param start_on_access
* IN: Whether the logging begins as soon as the file is opened or created.
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
* @exception NullPointerException
* - location is null.
*
**/
public synchronized static native void H5Pset_mdc_log_options(long fapl_id, boolean is_enabled, String location, boolean start_on_access)
throws HDF5LibraryException, NullPointerException;
/**
* H5Pget_mdc_log_options gets metadata cache logging options.
*
* @param fapl_id
* IN: File access property list identifier
* @param mdc_log_options, the options
* mdc_logging_options[0] = is_enabled, whether logging is enabled
* mdc_logging_options[1] = start_on_access, whether the logging begins as soon as the file is opened or created
*
* @return the location of log in UTF-8/ASCII (file path/name) (On Windows, this must be ASCII).
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
*
**/
public synchronized static native String H5Pget_mdc_log_options(long fapl_id, boolean[] mdc_log_options)
throws HDF5LibraryException;
/**
* H5Pget_metadata_read_attempts retrieves the number of read attempts that is set in the file access property list plist_id.
*

64
java/src/jni/h5fImp.c
View File

@ -536,6 +536,70 @@ Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache
h5libraryError(env);
} /* end Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache */
/*
* Class: hdf_hdf5lib_H5
* Method: H5Fstart_mdc_logging
* Signature: (J)V
*/
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging
(JNIEnv *env, jclass cls, jlong file_id)
{
if (H5Fstart_mdc_logging((hid_t)file_id) < 0)
h5libraryError(env);
} /* end Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging */
/*
* Class: hdf_hdf5lib_H5
* Method: H5Fstop_mdc_logging
* Signature: (J)V
*/
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging
(JNIEnv *env, jclass cls, jlong file_id)
{
if (H5Fstop_mdc_logging((hid_t)file_id) < 0)
h5libraryError(env);
} /* end Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging */
/*
* Class: hdf_hdf5lib_H5
* Method: H5Fget_mdc_logging_status
* Signature: (J[Z)V
*/
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
(JNIEnv *env, jclass cls, jlong file_id, jbooleanArray mdc_logging_status)
{
hbool_t is_enabled;
hbool_t is_currently_logging;
jboolean *mdc_logging_status_ptr;
jint size;
jboolean isCopy;
if (mdc_logging_status == NULL) {
h5nullArgument(env, "H5Fget_mdc_logging_status: mdc_logging_status is NULL");
} /* end if */
else {
size = (int)ENVPTR->GetArrayLength(ENVPAR mdc_logging_status);
if (size < 2) {
h5badArgument(env, "H5Fget_mdc_logging_status: length of mdc_logging_status < 2.");
} /* end if */
else {
if (H5Fget_mdc_logging_status((hid_t)file_id, &is_enabled, &is_currently_logging) < 0) {
h5libraryError(env);
} /* end if */
else {
mdc_logging_status_ptr = ENVPTR->GetBooleanArrayElements(ENVPAR mdc_logging_status, &isCopy);
mdc_logging_status_ptr[0] = (jboolean)is_enabled;
mdc_logging_status_ptr[1] = (jboolean)is_currently_logging;
ENVPTR->ReleaseBooleanArrayElements(ENVPAR mdc_logging_status, mdc_logging_status_ptr, 0);
} /* end else */
} /* end else */
} /* end else */
} /* end Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status */
#ifdef __cplusplus
} /* end extern "C" */

27
java/src/jni/h5fImp.h
View File

@ -212,6 +212,33 @@ JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache
(JNIEnv *, jclass, jlong);
/*
* Class: hdf_hdf5lib_H5
* Method: H5Fstart_mdc_logging
* Signature: (J)V
*/
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging
(JNIEnv *, jclass, jlong);
/*
* Class: hdf_hdf5lib_H5
* Method: H5Fstop_mdc_logging
* Signature: (J)V
*/
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging
(JNIEnv *, jclass, jlong);
/*
* Class: hdf_hdf5lib_H5
* Method: H5Fget_mdc_logging_status
* Signature: (J[Z)V
*/
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
(JNIEnv *, jclass, jlong, jbooleanArray);
#ifdef __cplusplus
} /* end extern "C" */
#endif /* __cplusplus */

90
java/src/jni/h5pImp.c
View File

@ -5007,6 +5007,96 @@ H5P_cls_close_cb
return (herr_t)status;
} /* end H5P_cls_close_cb */
/*
* Class: hdf_hdf5lib_H5
* Method: H5Pset_mdc_log_options
* Signature: (JZLjava/lang/String;Z)V
*/
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options
(JNIEnv *env, jclass clss, jlong fapl_id, jboolean is_enabled, jstring location, jboolean start_on_access)
{
herr_t retVal = -1;
const char *lstr;
PIN_JAVA_STRING(location, lstr);
retVal = H5Pset_mdc_log_options((hid_t)fapl_id, (hbool_t)is_enabled, lstr, (hbool_t)start_on_access);
UNPIN_JAVA_STRING(location, lstr);
if (retVal < 0) {
h5libraryError(env);
}
} /* end Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options */
/*
* Class: hdf_hdf5lib_H5
* Method: H5Pget_mdc_log_options
* Signature: (J[Z)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options
(JNIEnv *env, jclass clss, jlong fapl_id, jbooleanArray mdc_log_options)
{
hbool_t is_enabled;
hbool_t start_on_access;
jboolean *mdc_log_options_ptr;
char *lname;
size_t location_size;
ssize_t status;
jstring str = NULL;
jint size;
jboolean isCopy;
if (mdc_log_options == NULL) {
h5nullArgument(env, "H5Fget_mdc_log_options: mdc_log_options is NULL");
} /* end if */
else {
size = (int)ENVPTR->GetArrayLength(ENVPAR mdc_log_options);
if (size < 2) {
h5badArgument(env, "H5Fget_mdc_log_options: length of mdc_log_options < 2.");
} /* end if */
else {
/* get the length of the filename */
H5Pget_mdc_log_options((hid_t)fapl_id, &is_enabled, NULL, &location_size, &start_on_access);
if (location_size < 0) {
h5badArgument(env, "H5Pget_mdc_log_options: location_size < 0");
}/* end if */
else if (location_size > 0) {
location_size++; /* add extra space for the null terminator */
lname = (char *)HDmalloc(sizeof(char) * location_size);
if (lname == NULL) {
h5outOfMemory(env, "H5Pget_mdc_log_options: malloc failed");
} /* end if */
else {
status = H5Pget_mdc_log_options((hid_t)fapl_id, &is_enabled, lname, &location_size, &start_on_access);
if (status < 0) {
HDfree(lname);
h5libraryError(env);
} /* end if */
else {
str = ENVPTR->NewStringUTF(ENVPAR lname);
HDfree(lname);
if (str == NULL) {
h5JNIFatalError(env, "H5Pget_mdc_log_options: return string not allocated");
} /* end if */
else {
mdc_log_options_ptr = ENVPTR->GetBooleanArrayElements(ENVPAR mdc_log_options, &isCopy);
mdc_log_options_ptr[0] = (jboolean)is_enabled;
mdc_log_options_ptr[1] = (jboolean)start_on_access;
ENVPTR->ReleaseBooleanArrayElements(ENVPAR mdc_log_options, mdc_log_options_ptr, 0);
} /* end else */
} /* end else */
} /* end else */
} /* end else if*/
} /* end else */
} /* end else */
return (jstring)str;
} /* end if */
static herr_t
H5D_append_cb
(hid_t dataset_id, hsize_t *cur_dims, void *op_data)

18
java/src/jni/h5pImp.h
View File

@ -1402,6 +1402,24 @@ JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Pset_1file_1space
(JNIEnv *, jclass, jlong, jint, jlong);
/*
* Class: hdf_hdf5lib_H5
* Method: H5Pset_mdc_log_options
* Signature: (JZLjava/lang/String;Z)V
*/
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options
(JNIEnv *, jclass, jlong, jboolean, jstring, jboolean);
/*
* Class: hdf_hdf5lib_H5
* Method: H5Pget_mdc_log_options
* Signature: (J[Z)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options
(JNIEnv *, jclass, jlong, jbooleanArray);
/*
* Class: hdf_hdf5lib_H5
* Method: H5Pset_append_flush

3
java/test/JUnit-interface.txt
View File

@ -496,6 +496,7 @@ JUnit version 4.11
.testH5P_fapl_family
.testH5P_chunk_cache
.testH5P_meta_block_size
.testH5Fmdc_logging
.testH5Pget_elink_fapl
.testH5Pset_mdc_config
.testH5P_small_data_block_size
@ -634,7 +635,7 @@ JUnit version 4.11
Time: XXXX
OK (632 tests)
OK (633 tests)
HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
#000: (file name) line (number) in H5Fopen(): can't set access and transfer property lists

55
java/test/TestH5Pfapl.java
View File

@ -1322,4 +1322,59 @@ public class TestH5Pfapl {
}
}
}
@Test
public void testH5Fmdc_logging() {
boolean[] mdc_logging_status = {false, false};
boolean[] mdc_log_options = {false, false};
try {
boolean is_enabled = true;
boolean start_on_access = false;
H5.H5Pset_mdc_log_options(fapl_id, is_enabled, H5_LOG_FILE, start_on_access);
String location = H5.H5Pget_mdc_log_options(fapl_id, mdc_log_options);
assertTrue("H5.H5Pget_mdc_log_options: is_enabled", mdc_log_options[0]);
assertFalse("H5.H5Pget_mdc_log_options: start_on_access_out", mdc_log_options[1]);
H5.H5Pset_libver_bounds(fapl_id, HDF5Constants.H5F_LIBVER_LATEST, HDF5Constants.H5F_LIBVER_LATEST);
}
catch (Throwable err) {
err.printStackTrace();
fail("mdc_log_option: " + err);
}
_createH5File(fapl_id);
try {
H5.H5Fget_mdc_logging_status(H5fid, mdc_logging_status);
}
catch (Throwable err) {
fail("H5.H5Fget_mdc_logging_status: " + err);
}
assertTrue("initial: is_enabled", mdc_logging_status[0]);
assertFalse("initial: is_currently_logging", mdc_logging_status[1]);
try {
H5.H5Fstart_mdc_logging(H5fid);
H5.H5Fget_mdc_logging_status(H5fid, mdc_logging_status);
}
catch (Throwable err) {
fail("start H5.H5Fget_mdc_logging_status: " + err);
}
assertTrue("start: is_enabled", mdc_logging_status[0]);
assertTrue("start: is_currently_logging", mdc_logging_status[1]);
try {
H5.H5Fstop_mdc_logging(H5fid);
H5.H5Fget_mdc_logging_status(H5fid, mdc_logging_status);
}
catch (Throwable err) {
fail("stop H5.H5Fget_mdc_logging_status: " + err);
}
// assertFalse("stop: is_enabled", mdc_logging_status[0]);
assertFalse("stop: is_currently_logging", mdc_logging_status[1]);
deleteH5file();
_deleteLogFile();
}
}