Commit 565605b5 authored by brinn's avatar brinn
Browse files

Add initial changes to make HDF 1.12.0 compile and run.

parent 5c9ee4ca
......@@ -8,7 +8,7 @@ fi
rm -fR build/jni
rm -f build/libjhdf5.so
cp -a jni build/
cp -a build/hdf5-$VERSION/java/src/jni build/
cp -a *.c build/jni/
cd build
cp hdf5-$VERSION/src/H5win32defs.h jni/
......
......@@ -17,6 +17,7 @@
#include "hdf5.h"
#include "H5Ppublic.h"
#include "h5jni.h"
#include "h5util.h"
#include <jni.h>
#include <stdlib.h>
......@@ -75,14 +76,12 @@ Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lexists
(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
{
htri_t bval = JNI_FALSE;
const char *lName;
const char *lName = NULL;
PIN_JAVA_STRING(name, lName);
PIN_JAVA_STRING(ENVONLY, name, lName, NULL, "H5Lexists: name not pinned");
if (lName != NULL) {
bval = H5Lexists((hid_t)loc_id, lName, (hid_t)access_id);
UNPIN_JAVA_STRING(name, lName);
if (bval > 0)
bval = JNI_TRUE;
else if (bval < 0)
......@@ -92,10 +91,14 @@ Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lexists
bval = JNI_FALSE;
} else
{
h5libraryError(env);
H5_LIBRARY_ERROR(ENVONLY);
}
}
}
done:
if (lName != NULL)
UNPIN_JAVA_STRING(ENVONLY, name, lName);
return (jboolean)bval;
} /* end Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lexists */
......@@ -108,37 +111,32 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
(JNIEnv *env, jclass clss, jlong loc_id, jstring object_name,
jobjectArray linkName)
{
jint type;
herr_t status;
jint type = FAIL;
herr_t status = FAIL;
long minor_err_num;
char *oName;
const char *oName = NULL;
char *linkval_buf;
const char *filename;
const char *obj_path;
jboolean isCopy;
jstring str;
H5L_info_t link_info;
H5O_info_t obj_info;
H5O_info1_t obj_info;
PIN_JAVA_STRING(object_name, oName);
PIN_JAVA_STRING(ENVONLY, object_name, oName, NULL, "H5Lget_link_info: name not pinned");
type = H5Lget_info( (hid_t) loc_id, oName, &link_info, H5P_DEFAULT );
if (type < 0)
{
UNPIN_JAVA_STRING(object_name, oName);
h5libraryError(env);
return -1;
H5_LIBRARY_ERROR(ENVONLY);
} else {
str = NULL;
if (link_info.type == H5L_TYPE_HARD)
{
status = H5Oget_info_by_name1(loc_id, oName, &obj_info, H5P_DEFAULT);
UNPIN_JAVA_STRING(object_name, oName);
if (status < 0 )
{
h5libraryError(env);
return -1;
H5_LIBRARY_ERROR(ENVONLY);
} else {
type = obj_info.type;
}
......@@ -155,8 +153,7 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
}
if (H5Lget_val(loc_id, oName, linkval_buf, link_info.u.val_size, H5P_DEFAULT) < 0)
{
h5libraryError(env);
return -1;
H5_LIBRARY_ERROR(ENVONLY);
}
if (link_info.type == H5L_TYPE_EXTERNAL)
{
......@@ -174,6 +171,10 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
}
}
}
done:
if (oName != NULL)
UNPIN_JAVA_STRING(ENVONLY, object_name, oName);
return (jint)type;
}
......@@ -183,9 +184,9 @@ typedef struct link_info_all
JNIEnv *env;
char **name;
int *type;
char **linkname;
char **linkfname;
void **buf;
const char **linkname;
const char **linkfname;
char **buf;
int count;
} link_info_all_t;
......@@ -207,7 +208,7 @@ herr_t link_names_all(hid_t loc_id, const char *name, const H5L_info_t *link_inf
return 0;
}
herr_t H5Lget_link_names_all( JNIEnv *env, hid_t loc_id, char *group_name, char **names )
herr_t H5Lget_link_names_all( JNIEnv *env, hid_t loc_id, const char *group_name, char **names )
{
link_info_all_t info;
info.env = env;
......@@ -228,37 +229,32 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
(JNIEnv *env, jclass clss, jlong loc_id, jstring group_name,
jobjectArray oname, jint n)
{
herr_t status;
char *gName=NULL;
char **oName=NULL;
char **lName=NULL;
herr_t status = FAIL;
const char *gName = NULL;
char **oName = NULL;
char **lName = NULL;
jstring str;
jboolean isCopy;
int i;
if (oname == NULL) {
h5nullArgument( env, "_H5Lget_link_names_all: oname is NULL");
return -1;
H5_NULL_ARGUMENT_ERROR(ENVONLY, "_H5Lget_link_names_all: oname is NULL");
}
PIN_JAVA_STRING(group_name, gName);
PIN_JAVA_STRING(ENVONLY, group_name, gName, NULL, "H5Lget_link_names_all: group_name not pinned");
oName = malloc(n * sizeof (*oName));
oName = HDmalloc(n * sizeof (*oName));
if (oName == NULL) {
UNPIN_JAVA_STRING(group_name, gName);
h5outOfMemory(env, "_H5Lget_link_names_all: malloc failed");
return -1;
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "_H5Lget_link_names_all: failed to allocate oName buffer");
}
for (i=0; i<n; i++) {
oName[i] = NULL;
} /* for (i=0; i<n; i++)*/
status = H5Lget_link_names_all(env, (hid_t) loc_id, gName, oName);
UNPIN_JAVA_STRING(group_name, gName);
status = H5Lget_link_names_all(env, (hid_t) loc_id, gName, oName);
if (status < 0) {
h5str_array_free(oName, n);
h5libraryError(env);
H5_LIBRARY_ERROR(ENVONLY);
} else {
for (i=0; i<n; i++) {
if (*(oName+i)) {
......@@ -268,6 +264,10 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
} /* for (i=0; i<n; i++)*/
h5str_array_free(oName, n);
}
done:
if (gName != NULL)
UNPIN_JAVA_STRING(ENVONLY, group_name, gName);
return (jint)status;
......@@ -277,11 +277,11 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
herr_t link_info_all(hid_t loc_id, const char *name, const H5L_info_t *link_info, void *opdata)
{
link_info_all_t* info = (link_info_all_t*)opdata;
H5O_info_t obj_info;
H5O_info1_t obj_info;
char *linkval_buf;
const char *filename;
const char *obj_path;
*(info->name+info->count) = (char *) malloc(strlen(name)+1);
*(info->name+info->count) = (char *) HDmalloc(strlen(name)+1);
if (*(info->name+info->count) == NULL)
{
h5outOfMemory(info->env, "H5Lget_link_info_all: malloc failed");
......@@ -306,7 +306,7 @@ herr_t link_info_all(hid_t loc_id, const char *name, const H5L_info_t *link_info
*(info->type+info->count) = H5O_TYPE_NTYPES + link_info->type;
if (info->linkname != NULL)
{
linkval_buf = (char*) malloc(link_info->u.val_size);
linkval_buf = (char*) HDmalloc(link_info->u.val_size);
if (linkval_buf == NULL)
{
h5outOfMemory(info->env, "H5Lget_link_info_all: malloc failed");
......@@ -337,7 +337,7 @@ herr_t link_info_all(hid_t loc_id, const char *name, const H5L_info_t *link_info
return 0;
}
herr_t H5Lget_link_info_all( JNIEnv *env, hid_t loc_id, char *group_name, char **names, int *linktypes, char **linknames, char **linkfnames, void **buf )
herr_t H5Lget_link_info_all( JNIEnv *env, hid_t loc_id, const char *group_name, char **names, int *linktypes, const char **linknames, const char **linkfnames, char **buf )
{
link_info_all_t info;
info.env = env;
......@@ -362,18 +362,17 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
(JNIEnv *env, jclass clss, jlong loc_id, jstring group_name,
jobjectArray oname, jintArray otype, jobjectArray lname, jobjectArray lfname, jint n)
{
herr_t status;
char *gName=NULL;
char **oName=NULL;
char **lName=NULL;
char **lfName=NULL;
void **buf=NULL;
jboolean isCopy;
herr_t status = FAIL;
const char *gName = NULL;
char **oName = NULL;
char **lName = NULL;
char **lfName = NULL;
char **buf = NULL;
jstring str;
jint *tarr;
int i;
PIN_JAVA_STRING(group_name, gName);
PIN_JAVA_STRING(ENVONLY, group_name, gName, NULL, "H5Lget_link_info_all: group_name not pinned");
if (oname == NULL) {
h5nullArgument( env, "H5Lget_link_info_all: oname is NULL");
......@@ -390,19 +389,17 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
return -1;
}
tarr = (*env)->GetIntArrayElements(env,otype,&isCopy);
tarr = (*env)->GetIntArrayElements(env,otype, NULL);
if (tarr == NULL) {
(*env)->ReleaseStringUTFChars(env,group_name,gName);
h5JNIFatalError( env, "H5Lget_link_info_all: type not pinned");
return -1;
}
oName = malloc(n * sizeof (*oName));
oName = HDmalloc(n * sizeof (*oName));
if (oName == NULL) {
UNPIN_JAVA_STRING(group_name, gName);
(*env)->ReleaseIntArrayElements(env,otype,tarr,0);
h5outOfMemory(env, "H5Lget_link_info_all: malloc failed");
return -1;
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Lget_link_info_all: malloc failed");
}
for (i=0; i<n; i++)
{
......@@ -412,30 +409,24 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
{
lName = malloc(n * sizeof (*lName));
if (lName == NULL) {
UNPIN_JAVA_STRING(group_name, gName);
(*env)->ReleaseIntArrayElements(env,otype,tarr,0);
h5str_array_free(oName, n);
h5outOfMemory(env, "H5Lget_link_info_all: malloc failed");
return -1;
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Lget_link_info_all: malloc failed");
}
lfName = malloc(n * sizeof (*lfName));
if (lfName == NULL) {
UNPIN_JAVA_STRING(group_name, gName);
(*env)->ReleaseIntArrayElements(env,otype,tarr,0);
h5str_array_free(oName, n);
free(lName);
h5outOfMemory(env, "H5Lget_link_info_all: malloc failed");
return -1;
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Lget_link_info_all: malloc failed");
}
buf = malloc(n * sizeof (*buf));
if (buf == NULL) {
UNPIN_JAVA_STRING(group_name, gName);
(*env)->ReleaseIntArrayElements(env,otype,tarr,0);
h5str_array_free(oName, n);
free(lName);
free(lfName);
h5outOfMemory(env, "H5Lget_link_info_all: malloc failed");
return -1;
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Lget_link_info_all: malloc failed");
}
for (i=0; i<n; i++) {
lName[i] = NULL;
......@@ -443,9 +434,8 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
buf[i] = NULL;
} /* for (i=0; i<n; i++)*/
}
status = H5Lget_link_info_all( env, (hid_t) loc_id, gName, oName, (int *)tarr, lName, lfName, buf );
status = H5Lget_link_info_all( env, (hid_t) loc_id, gName, oName, (int *)tarr, (const char **)lName, (const char **)lfName, buf );
UNPIN_JAVA_STRING(group_name, gName);
if (status < 0) {
(*env)->ReleaseIntArrayElements(env,otype,tarr,JNI_ABORT);
h5str_array_free(oName, n);
......@@ -455,7 +445,7 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
h5str_array_free(lfName, n);
h5str_array_free(buf, n);
}
h5libraryError(env);
H5_LIBRARY_ERROR(ENVONLY);
} else {
(*env)->ReleaseIntArrayElements(env,otype,tarr,0);
......@@ -486,6 +476,10 @@ JNIEXPORT jint JNICALL Java_ch_systemsx_cisd_hdf5_hdf5lib_HDFHelper__1H5Lget_1li
}
h5str_array_free(oName, n);
}
done:
if (gName != NULL)
UNPIN_JAVA_STRING(ENVONLY, group_name, gName);
return (jint)status;
......
VERSION=1.10.5
VERSION=1.12.0
POSTFIX=
......@@ -279,9 +279,7 @@ class HDF5
public long openObject(long fileId, String path, ICleanUpRegistry registry)
{
checkMaxLength(path);
final long objectId =
isReference(path) ? H5Oopen_by_addr(fileId, Long.parseLong(path.substring(1)))
: H5Oopen(fileId, path, H5P_DEFAULT);
final long objectId = H5Oopen(fileId, path, H5P_DEFAULT);
registry.registerCleanUp(new Runnable()
{
@Override
......@@ -372,8 +370,7 @@ class HDF5
public long openGroup(long fileId, String path, ICleanUpRegistry registry)
{
checkMaxLength(path);
final long groupId = isReference(path) ? H5Oopen_by_addr(fileId, Long.parseLong(path.substring(1)))
: H5Gopen(fileId, path, H5P_DEFAULT);
final long groupId = H5Gopen(fileId, path, H5P_DEFAULT);
registry.registerCleanUp(new Runnable()
{
@Override
......@@ -932,8 +929,7 @@ class HDF5
public long openDataSet(long fileId, String path, ICleanUpRegistry registry)
{
checkMaxLength(path);
final long dataSetId = isReference(path) ? H5Oopen_by_addr(fileId, Long.parseLong(path.substring(1)))
: H5Dopen(fileId, path, H5P_DEFAULT);
final long dataSetId = H5Dopen(fileId, path, H5P_DEFAULT);
if (registry != null)
{
registry.registerCleanUp(new Runnable()
......@@ -948,6 +944,7 @@ class HDF5
return dataSetId;
}
// TODO: remove!
boolean isReference(String path)
{
return autoDereference && (path.charAt(0) == '\0');
......@@ -1778,8 +1775,7 @@ class HDF5
public long openDataType(long fileId, String name, ICleanUpRegistry registry)
{
checkMaxLength(name);
final long dataTypeId = isReference(name) ? H5Oopen_by_addr(fileId, Long.parseLong(name.substring(1)))
: H5Topen(fileId, name, H5P_DEFAULT);
final long dataTypeId = H5Topen(fileId, name, H5P_DEFAULT);
registry.registerCleanUp(new Runnable()
{
@Override
......
......@@ -16,7 +16,10 @@
package ch.systemsx.cisd.hdf5;
import java.util.Arrays;
import hdf.hdf5lib.structs.H5O_info_t;
import hdf.hdf5lib.structs.H5O_token_t;
/**
* Information about an object in an HDF5 file.
......@@ -28,7 +31,7 @@ public final class HDF5ObjectInformation extends HDF5CommonInformation
private final long fileNumber;
private final long address;
private final H5O_token_t token;
private final int referenceCount;
......@@ -40,7 +43,7 @@ public final class HDF5ObjectInformation extends HDF5CommonInformation
{
super(path, objectType);
this.fileNumber = info.fileno;
this.address = info.addr;
this.token = info.token;
this.referenceCount = info.rc;
this.creationTime = info.ctime;
this.numberOfAttributes = info.num_attrs;
......@@ -59,9 +62,9 @@ public final class HDF5ObjectInformation extends HDF5CommonInformation
* Returns the address of the object in the file. If the address of two links is the same, then
* they point to the same object. Can be used to spot hard or soft links.
*/
public long getAddress()
public H5O_token_t getToken()
{
return address;
return token;
}
/**
......@@ -96,7 +99,7 @@ public final class HDF5ObjectInformation extends HDF5CommonInformation
final int prime = 31;
int result = 1;
result = prime * result + ((path == null) ? 0 : path.hashCode());
result = prime * result + ((int) address);
result = prime * result + Arrays.hashCode(token.data);
return result;
}
......@@ -126,7 +129,7 @@ public final class HDF5ObjectInformation extends HDF5CommonInformation
{
return false;
}
if (other.address != address)
if (other.token.equals(token) == false)
{
return false;
}
......
......@@ -101,7 +101,7 @@ public class HDFHelper
}
}
return new H5O_info_t(-1, -1, -1, -1, -1, -1, -1, -1, -1, null, null, null);
return new H5O_info_t(-1, null, -1, -1, -1, -1, -1, -1, -1);
}
/**
......
cmake_minimum_required (VERSION 3.10)
cmake_minimum_required (VERSION 3.12)
project (HDF5_JAVA_HDF C)
add_subdirectory (hdf5lib)
cmake_minimum_required (VERSION 3.10)
cmake_minimum_required (VERSION 3.12)
project (HDF5_JAVA_HDF_HDF5 Java)
set (CMAKE_VERBOSE_MAKEFILE 1)
......@@ -18,10 +18,10 @@ set (HDF5_JAVA_HDF_HDF5_CALLBACKS_SOURCES
callbacks/H5D_iterate_t.java
callbacks/H5E_walk_cb.java
callbacks/H5E_walk_t.java
callbacks/H5L_iterate_cb.java
callbacks/H5L_iterate_t.java
callbacks/H5O_iterate_cb.java
callbacks/H5L_iterate_opdata_t.java
callbacks/H5O_iterate_t.java
callbacks/H5O_iterate_opdata_t.java
callbacks/H5P_cls_close_func_cb.java
callbacks/H5P_cls_close_func_t.java
callbacks/H5P_cls_copy_func_cb.java
......@@ -73,10 +73,14 @@ set (HDF5_JAVA_HDF_HDF5_STRUCTS_SOURCES
structs/H5AC_cache_config_t.java
structs/H5E_error2_t.java
structs/H5F_info2_t.java
structs/H5FD_ros3_fapl_t.java
structs/H5FD_hdfs_fapl_t.java
structs/H5G_info_t.java
structs/H5L_info_t.java
structs/H5O_hdr_info_t.java
structs/H5O_info_t.java
structs/H5O_native_info_t.java
structs/H5O_token_t.java
)
set (HDF5_JAVA_HDF_HDF5_SOURCES
......
This diff is collapsed.
......@@ -14,6 +14,8 @@
package hdf.hdf5lib;
import hdf.hdf5lib.structs.H5O_token_t;
/**
* /** This class contains C constants and enumerated types of HDF5 library. The
* values of these constants are obtained from the library by calling J2C(int
......@@ -121,6 +123,7 @@ public class HDF5Constants {
public static final long H5E_CANTDEC = H5E_CANTDEC();
public static final long H5E_CANTDECODE = H5E_CANTDECODE();
public static final long H5E_CANTDELETE = H5E_CANTDELETE();
public static final long H5E_CANTDELETEFILE = H5E_CANTDELETEFILE();
public static final long H5E_CANTENCODE = H5E_CANTENCODE();
public static final long H5E_CANTFLUSH = H5E_CANTFLUSH();
public static final long H5E_CANTFREE = H5E_CANTFREE();
......@@ -190,10 +193,16 @@ public class HDF5Constants {
public static final long H5E_UNSUPPORTED = H5E_UNSUPPORTED();
public static final long H5E_VERSION = H5E_VERSION();
public static final long H5E_VFL = H5E_VFL();
public static final long H5E_VOL = H5E_VOL();
public static final long H5E_WALK_DOWNWARD = H5E_WALK_DOWNWARD();
public static final long H5E_WALK_UPWARD = H5E_WALK_UPWARD();
public static final long H5E_WRITEERROR = H5E_WRITEERROR();
private static final int H5ES_STATUS_IN_PROGRESS = H5ES_STATUS_IN_PROGRESS();
private static final int H5ES_STATUS_SUCCEED = H5ES_STATUS_SUCCEED();
private static final int H5ES_STATUS_FAIL = H5ES_STATUS_FAIL();
private static final int H5ES_STATUS_CANCELED = H5ES_STATUS_CANCELED();
public static final int H5F_ACC_CREAT = H5F_ACC_CREAT();
public static final int H5F_ACC_EXCL = H5F_ACC_EXCL();
public static final int H5F_ACC_RDONLY = H5F_ACC_RDONLY();
......@@ -210,6 +219,7 @@ public class HDF5Constants {
public static final int H5F_LIBVER_EARLIEST = H5F_LIBVER_EARLIEST();
public static final int H5F_LIBVER_V18 = H5F_LIBVER_V18();
public static final int H5F_LIBVER_V110 = H5F_LIBVER_V110();
public static final int H5F_LIBVER_V112 = H5F_LIBVER_V112();
public static final int H5F_LIBVER_NBOUNDS = H5F_LIBVER_NBOUNDS();
public static final int H5F_LIBVER_LATEST = H5F_LIBVER_LATEST();
public static final int H5F_OBJ_ALL = H5F_OBJ_ALL();
......@@ -238,6 +248,8 @@ public class HDF5Constants {
public static final long H5FD_SEC2 = H5FD_SEC2();
public static final long H5FD_STDIO = H5FD_STDIO();
public static final long H5FD_WINDOWS = H5FD_WINDOWS();
public static final long H5FD_ROS3 = H5FD_ROS3();
public static final long H5FD_HDFS = H5FD_HDFS();
public static final int H5FD_LOG_LOC_READ = H5FD_LOG_LOC_READ();
public static final int H5FD_LOG_LOC_WRITE = H5FD_LOG_LOC_WRITE();
public static final int H5FD_LOG_LOC_SEEK = H5FD_LOG_LOC_SEEK();
......@@ -314,9 +326,9 @@ public class HDF5Constants {
public static final int H5I_GROUP = H5I_GROUP();
public static final int H5I_INVALID_HID = H5I_INVALID_HID();
public static final int H5I_NTYPES = H5I_NTYPES();
public static final int H5I_REFERENCE = H5I_REFERENCE();
public static final int H5I_UNINIT = H5I_UNINIT();
public static final int H5I_VFL = H5I_VFL();
public static final int H5I_VOL = H5I_VOL();
public static final int H5L_TYPE_ERROR = H5L_TYPE_ERROR();
public static final int H5L_TYPE_HARD = H5L_TYPE_HARD();
......@@ -333,9 +345,10 @@ public class HDF5Constants {
public static final int H5O_INFO_BASIC = H5O_INFO_BASIC();
public static final int H5O_INFO_TIME = H5O_INFO_TIME();
public static final int H5O_INFO_NUM_ATTRS = H5O_INFO_NUM_ATTRS();
public static final int H5O_INFO_HDR = H5O_INFO_HDR();
public static final int H5O_INFO_META_SIZE = H5O_INFO_META_SIZE();
public static final int H5O_INFO_ALL = H5O_INFO_ALL();
public static final int H5O_NATIVE_INFO_HDR = H5O_NATIVE_INFO_HDR();
public static final int H5O_NATIVE_INFO_META_SIZE = H5O_NATIVE_INFO_META_SIZE();
public static final int H5O_NATIVE_INFO_ALL = H5O_NATIVE_INFO_ALL();
public static final int H5O_SHMESG_NONE_FLAG = H5O_SHMESG_NONE_FLAG();
public static final int H5O_SHMESG_SDSPACE_FLAG = H5O_SHMESG_SDSPACE_FLAG();
public static final int H5O_SHMESG_DTYPE_FLAG = H5O_SHMESG_DTYPE_FLAG();
......@@ -348,6 +361,8 @@ public class HDF5Constants {
public static final int H5O_TYPE_DATASET = H5O_TYPE_DATASET();
public static final int H5O_TYPE_NAMED_DATATYPE = H5O_TYPE_NAMED_DATATYPE();
public static final int H5O_TYPE_NTYPES = H5O_TYPE_NTYPES();
public static final int H5O_MAX_TOKEN_SIZE = H5O_MAX_TOKEN_SIZE();
public static final H5O_token_t H5O_TOKEN_UNDEF = H5O_TOKEN_UNDEF();
public static final long H5P_ROOT = H5P_ROOT();
public static final long H5P_OBJECT_CREATE = H5P_OBJECT_CREATE();
......@@ -367,6 +382,7 @@ public class HDF5Constants {
public static final long H5P_OBJECT_COPY = H5P_OBJECT_COPY();
public static final long H5P_LINK_CREATE = H5P_LINK_CREATE();
public static final long H5P_LINK_ACCESS = H5P_LINK_ACCESS();
public static final long H5P_VOL_INITIALIZE = H5P_VOL_INITIALIZE();
public static final long H5P_FILE_CREATE_DEFAULT = H5P_FILE_CREATE_DEFAULT();
public static final long H5P_FILE_ACCESS_DEFAULT = H5P_FILE_ACCESS_DEFAULT();
public static final long H5P_DATASET_CREATE_DEFAULT = H5P_DATASET_CREATE_DEFAULT();
......@@ -382,20 +398,31 @@ public class HDF5Constants {
public static final long H5P_OBJECT_COPY_DEFAULT = H5P_OBJECT_COPY_DEFAULT();
public static final long H5P_LINK_CREATE_DEFAULT = H5P_LINK_CREATE_DEFAULT();
public static final long H5P_LINK_ACCESS_DEFAULT = H5P_LINK_ACCESS_DEFAULT();
public static final long H5P_VOL_INITIALIZE_DEFAULT = H5P_VOL_INITIALIZE_DEFAULT();
public static final int H5P_CRT_ORDER_TRACKED = H5P_CRT_ORDER_TRACKED();
public static final int H5P_CRT_ORDER_INDEXED = H5P_CRT_ORDER_INDEXED();
public static final long H5P_DEFAULT = H5P_DEFAULT();
public static final int H5PL_TYPE_ERROR = H5PL_TYPE_ERROR();
public static final int H5PL_TYPE_FILTER = H5PL_TYPE_FILTER();
public static final int H5PL_TYPE_VOL = H5PL_TYPE_VOL();
public static final int H5PL_TYPE_NONE = H5PL_TYPE_NONE();
public static final int H5PL_FILTER_PLUGIN = H5PL_FILTER_PLUGIN();
public static final int H5PL_VOL_PLUGIN = H5PL_VOL_PLUGIN();
public static final int H5PL_ALL_PLUGIN = H5PL_ALL_PLUGIN();