Add support for HDF5 1.12.0

Author: mulimoen

hdf5-sys/build.rs

@@ -25,7 +25,7 @@ impl Version {
     }
 
     pub fn parse(s: &str) -> Option<Self> {
-        let re = Regex::new(r"^(1)\.(8|10)\.(\d\d?)(_\d+)?(-patch\d+)?$").ok()?;
+        let re = Regex::new(r"^(1)\.(8|10|12)\.(\d\d?)(_\d+)?(-patch\d+)?$").ok()?;
         let captures = re.captures(s)?;
         Some(Self {
             major: captures.get(1).and_then(|c| c.as_str().parse::<u8>().ok())?,
@@ -35,7 +35,10 @@ impl Version {
     }
 
     pub fn is_valid(self) -> bool {
-        self.major == 1 && ((self.minor == 8 && self.micro >= 4) || (self.minor == 10))
+        self.major == 1
+            && ((self.minor == 8 && self.micro >= 4)
+                || (self.minor == 10)
+                || (self.minor == 12 && self.micro == 0))
     }
 }
 
@@ -592,6 +595,7 @@ impl Config {
         assert!(version >= Version::new(1, 8, 4), "required HDF5 version: >=1.8.4");
         let mut vs: Vec<_> = (5..=21).map(|v| Version::new(1, 8, v)).collect(); // 1.8.[5-21]
         vs.extend((0..=5).map(|v| Version::new(1, 10, v))); // 1.10.[0-5]
+        vs.push(Version::new(1, 12, 0)); // 1.12.0
         for v in vs.into_iter().filter(|&v| version >= v) {
             println!("cargo:rustc-cfg=hdf5_{}_{}_{}", v.major, v.minor, v.micro);
             println!("cargo:version_{}_{}_{}=1", v.major, v.minor, v.micro);

hdf5-sys/src/h5f.rs

@@ -139,16 +139,22 @@ extern "C" {
     )]
     pub fn H5Fset_latest_format(file_id: hid_t, latest_format: hbool_t) -> herr_t;
     pub fn H5Fis_hdf5(filename: *const c_char) -> htri_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Fis_accessible(container_name: *const c_char, fapl_id: hid_t) -> htri_t;
     pub fn H5Fcreate(
         filename: *const c_char, flags: c_uint, create_plist: hid_t, access_plist: hid_t,
     ) -> hid_t;
     pub fn H5Fopen(filename: *const c_char, flags: c_uint, access_plist: hid_t) -> hid_t;
     pub fn H5Freopen(file_id: hid_t) -> hid_t;
     pub fn H5Fflush(object_id: hid_t, scope: H5F_scope_t) -> herr_t;
     pub fn H5Fclose(file_id: hid_t) -> herr_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Fdelete(filename: *const c_char, fapl_id: hid_t) -> herr_t;
     pub fn H5Fget_create_plist(file_id: hid_t) -> hid_t;
     pub fn H5Fget_access_plist(file_id: hid_t) -> hid_t;
     pub fn H5Fget_intent(file_id: hid_t, intent: *mut c_uint) -> herr_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Fget_fileno(file_id: hid_t, fileno: *mut c_ulong) -> herr_t;
     pub fn H5Fget_obj_count(file_id: hid_t, types: c_uint) -> ssize_t;
     pub fn H5Fget_obj_ids(
         file_id: hid_t, types: c_uint, max_objs: size_t, obj_id_list: *mut hid_t,

hdf5-sys/src/h5i.rs

@@ -8,20 +8,27 @@ pub enum H5I_type_t {
     H5I_UNINIT = -2,
     H5I_BADID = -1,
     H5I_FILE = 1,
-    H5I_GROUP = 2,
-    H5I_DATATYPE = 3,
-    H5I_DATASPACE = 4,
-    H5I_DATASET = 5,
-    H5I_ATTR = 6,
+    H5I_GROUP,
+    H5I_DATATYPE,
+    H5I_DATASPACE,
+    H5I_DATASET,
+    #[cfg(hdf5_1_12_0)]
+    H5I_MAP,
+    H5I_ATTR,
+    #[cfg(not(hdf5_1_12_0))]
     #[cfg_attr(hdf5_1_10_2, deprecated(note = "deprecated in HDF5 1.10.2"))]
-    H5I_REFERENCE = 7,
-    H5I_VFL = 8,
-    H5I_GENPROP_CLS = 9,
-    H5I_GENPROP_LST = 10,
-    H5I_ERROR_CLASS = 11,
-    H5I_ERROR_MSG = 12,
-    H5I_ERROR_STACK = 13,
-    H5I_NTYPES = 14,
+    H5I_REFERENCE,
+    H5I_VFL,
+    #[cfg(hdf5_1_12_0)]
+    H5I_VOL,
+    H5I_GENPROP_CLS,
+    H5I_GENPROP_LST,
+    H5I_ERROR_CLASS,
+    H5I_ERROR_MSG,
+    H5I_ERROR_STACK,
+    #[cfg(hdf5_1_12_0)]
+    H5I_SPACE_SEL_ITER,
+    H5I_NTYPES,
 }
 
 #[cfg(hdf5_1_10_0)]
@@ -35,6 +42,8 @@ pub const H5I_INVALID_HID: hid_t = -1;
 pub type H5I_free_t = Option<extern "C" fn(arg1: *mut c_void) -> herr_t>;
 pub type H5I_search_func_t =
     Option<extern "C" fn(obj: *mut c_void, id: hid_t, key: *mut c_void) -> c_int>;
+#[cfg(hdf5_1_12_0)]
+pub type H5I_iterate_func_t = Option<extern "C" fn(id: hid_t, udata: *mut c_void) -> herr_t>;
 
 extern "C" {
     pub fn H5Iregister(type_: H5I_type_t, object: *const c_void) -> hid_t;
@@ -55,6 +64,8 @@ extern "C" {
     pub fn H5Idec_type_ref(type_: H5I_type_t) -> c_int;
     pub fn H5Iget_type_ref(type_: H5I_type_t) -> c_int;
     pub fn H5Isearch(type_: H5I_type_t, func: H5I_search_func_t, key: *mut c_void) -> *mut c_void;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Iiterate(type_: H5I_type_t, op: H5I_iterate_func_t, op_data: *mut c_void) -> herr_t;
     pub fn H5Inmembers(type_: H5I_type_t, num_members: *mut hsize_t) -> herr_t;
     pub fn H5Itype_exists(type_: H5I_type_t) -> htri_t;
     pub fn H5Iis_valid(id: hid_t) -> htri_t;

hdf5-sys/src/h5l.rs

@@ -2,6 +2,8 @@ use std::mem;
 
 pub use self::H5L_type_t::*;
 
+#[cfg(hdf5_1_12_0)]
+use crate::h5o::H5O_token_t;
 use crate::internal_prelude::*;
 
 pub const H5L_MAX_LINK_NAME_LEN: uint32_t = !0;
@@ -25,33 +27,33 @@ pub const H5L_TYPE_UD_MIN: H5L_type_t = H5L_TYPE_EXTERNAL;
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct H5L_info_t {
+pub struct H5L_info1_t {
     pub type_: H5L_type_t,
     pub corder_valid: hbool_t,
     pub corder: int64_t,
     pub cset: H5T_cset_t,
-    pub u: H5L_info_t__u,
+    pub u: H5L_info1_t__u,
 }
 
-impl Default for H5L_info_t {
+impl Default for H5L_info1_t {
     fn default() -> Self {
         unsafe { mem::zeroed() }
     }
 }
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct H5L_info_t__u {
+pub struct H5L_info1_t__u {
     value: [u64; 1usize],
 }
 
-impl Default for H5L_info_t__u {
+impl Default for H5L_info1_t__u {
     fn default() -> Self {
         unsafe { mem::zeroed() }
     }
 }
 
-impl H5L_info_t__u {
+impl H5L_info1_t__u {
     pub unsafe fn address(&mut self) -> *mut haddr_t {
         &self.value as *const [u64; 1] as *mut haddr_t
     }
@@ -60,6 +62,39 @@ impl H5L_info_t__u {
     }
 }
 
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+#[cfg(hdf5_1_12_0)]
+pub struct H5L_info2_t {
+    pub type_: H5L_type_t,
+    pub corder_valid: hbool_t,
+    pub corder: int64_t,
+    pub cset: H5T_cset_t,
+    pub u: H5L_info1_t__u,
+}
+
+#[cfg(hdf5_1_12_0)]
+impl Default for H5L_info2_t {
+    fn default() -> Self {
+        unsafe { mem::zeroed() }
+    }
+}
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+#[cfg(hdf5_1_12_0)]
+pub union H5L_info2_t__u {
+    token: H5O_token_t,
+    val_size: size_t,
+}
+
+#[cfg(hdf5_1_12_0)]
+impl Default for H5L_info2_t__u {
+    fn default() -> Self {
+        unsafe { mem::zeroed() }
+    }
+}
+
 pub type H5L_create_func_t = Option<
     extern "C" fn(
         link_name: *const c_char,
@@ -132,11 +167,20 @@ impl Default for H5L_class_t {
     }
 }
 
-pub type H5L_iterate_t = Option<
+pub type H5L_iterate1_t = Option<
+    extern "C" fn(
+        group: hid_t,
+        name: *const c_char,
+        info: *const H5L_info1_t,
+        op_data: *mut c_void,
+    ) -> herr_t,
+>;
+#[cfg(hdf5_1_12_0)]
+pub type H5L_iterate2_t = Option<
     extern "C" fn(
         group: hid_t,
         name: *const c_char,
-        info: *const H5L_info_t,
+        info: *const H5L_info2_t,
         op_data: *mut c_void,
     ) -> herr_t,
 >;
@@ -182,32 +226,82 @@ extern "C" {
         n: hsize_t, buf: *mut c_void, size: size_t, lapl_id: hid_t,
     ) -> herr_t;
     pub fn H5Lexists(loc_id: hid_t, name: *const c_char, lapl_id: hid_t) -> htri_t;
-    pub fn H5Lget_info(
-        loc_id: hid_t, name: *const c_char, linfo: *mut H5L_info_t, lapl_id: hid_t,
+    #[cfg_attr(hdf5_1_12_0, deprecated(note = "deprecated in HDF5 1.12.0, use H5Lget_info2()"))]
+    #[cfg_attr(not(hdf5_1_12_0), link_name = "H5Lget_info")]
+    pub fn H5Lget_info1(
+        loc_id: hid_t, name: *const c_char, linfo: *mut H5L_info1_t, lapl_id: hid_t,
+    ) -> herr_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Lget_info2(
+        loc_id: hid_t, name: *const c_char, linfo: *mut H5L_info2_t, lapl_id: hid_t,
     ) -> herr_t;
+    #[cfg_attr(
+        hdf5_1_12_0,
+        deprecated(note = "deprecated in HDF5 1.12.0, use H5Lget_info_by_idx2()")
+    )]
+    #[cfg_attr(not(hdf5_1_12_0), link_name = "H5Lget_info_by_idx")]
     pub fn H5Lget_info_by_idx(
         loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-        n: hsize_t, linfo: *mut H5L_info_t, lapl_id: hid_t,
+        n: hsize_t, linfo: *mut H5L_info1_t, lapl_id: hid_t,
+    ) -> herr_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Lget_info_by_idx2(
+        loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
+        n: hsize_t, linfo: *mut H5L_info2_t, lapl_id: hid_t,
     ) -> herr_t;
     pub fn H5Lget_name_by_idx(
         loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
         n: hsize_t, name: *mut c_char, size: size_t, lapl_id: hid_t,
     ) -> ssize_t;
-    pub fn H5Literate(
+    #[cfg_attr(hdf5_1_12_0, deprecated(note = "deprecated in HDF5 1.12.0, use H5Literate2()"))]
+    #[cfg_attr(not(hdf5_1_12_0), link_name = "H5Literate")]
+    pub fn H5Literate1(
         grp_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, idx: *mut hsize_t,
-        op: H5L_iterate_t, op_data: *mut c_void,
+        op: H5L_iterate1_t, op_data: *mut c_void,
     ) -> herr_t;
-    pub fn H5Literate_by_name(
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Literate2(
+        grp_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, idx: *mut hsize_t,
+        op: H5L_iterate2_t, op_data: *mut c_void,
+    ) -> herr_t;
+    #[cfg_attr(
+        hdf5_1_12_0,
+        deprecated(note = "deprecated in HDF5 1.12.0, use H5Literate_by_name2()")
+    )]
+    #[cfg_attr(not(hdf5_1_12_0), link_name = "H5Literate_by_name")]
+    pub fn H5Literate_by_name1(
         loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-        idx: *mut hsize_t, op: H5L_iterate_t, op_data: *mut c_void, lapl_id: hid_t,
+        idx: *mut hsize_t, op: H5L_iterate1_t, op_data: *mut c_void, lapl_id: hid_t,
     ) -> herr_t;
-    pub fn H5Lvisit(
-        grp_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5L_iterate_t,
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Literate_by_name2(
+        loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
+        idx: *mut hsize_t, op: H5L_iterate2_t, op_data: *mut c_void, lapl_id: hid_t,
+    ) -> herr_t;
+    #[cfg_attr(hdf5_1_12_0, deprecated(note = "deprecated in HDF5 1.12.0, use H5Lvisit2()"))]
+    #[cfg_attr(not(hdf5_1_12_0), link_name = "H5Lvisit")]
+    pub fn H5Lvisit1(
+        grp_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5L_iterate1_t,
         op_data: *mut c_void,
     ) -> herr_t;
-    pub fn H5Lvisit_by_name(
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Lvisit2(
+        grp_id: hid_t, idx_type: H5_index_t, order: H5_iter_order_t, op: H5L_iterate2_t,
+        op_data: *mut c_void,
+    ) -> herr_t;
+    #[cfg_attr(
+        hdf5_1_12_0,
+        deprecated(note = "deprecated in HDF5 1.12.0, use H5Lvisit_by_name2()")
+    )]
+    #[cfg_attr(not(hdf5_1_12_0), link_name = "H5Lvisit_by_name")]
+    pub fn H5Lvisit_by_name1(
+        loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
+        op: H5L_iterate1_t, op_data: *mut c_void, lapl_id: hid_t,
+    ) -> herr_t;
+    #[cfg(hdf5_1_12_0)]
+    pub fn H5Lvisit_by_name2(
         loc_id: hid_t, group_name: *const c_char, idx_type: H5_index_t, order: H5_iter_order_t,
-        op: H5L_iterate_t, op_data: *mut c_void, lapl_id: hid_t,
+        op: H5L_iterate2_t, op_data: *mut c_void, lapl_id: hid_t,
     ) -> herr_t;
     pub fn H5Lcreate_ud(
         link_loc_id: hid_t, link_name: *const c_char, link_type: H5L_type_t, udata: *const c_void,
@@ -225,3 +319,12 @@ extern "C" {
         link_name: *const c_char, lcpl_id: hid_t, lapl_id: hid_t,
     ) -> herr_t;
 }
+
+#[cfg(not(hdf5_1_12_0))]
+pub use self::{
+    H5L_info1_t as H5L_info_t, H5L_iterate1_t as H5L_iterate_t, H5Literate1 as H5Literate,
+};
+#[cfg(hdf5_1_12_0)]
+pub use self::{
+    H5L_info2_t as H5L_info_t, H5L_iterate2_t as H5L_iterate_t, H5Literate2 as H5Literate,
+};