Merge pull request #36 from WiresmithTech/feature/refs2

magnusuMET · web-flow · commit be721392d5a3 · 2024-11-27T09:10:48.000+01:00
Object Reference Types
diff --git a/hdf5-src/ext/hdf5 b/hdf5-src/ext/hdf5
@@ -1 +1 @@
-Subproject commit 0fe0459fc24d71be13d5f266513c2832b525671b
+Subproject commit db30c2da68ece4a155e9e50c28ec16d6057509b2
diff --git a/hdf5-types/build.rs b/hdf5-types/build.rs
@@ -4,4 +4,15 @@ fn main() {
     if std::env::var_os("DEP_HDF5_MSVC_DLL_INDIRECTION").is_some() {
         println!("cargo::rustc-cfg=windows_dll");
     }
+
+    // Declare the known HDF5 versions we might feature flag on
+    // in this crate.
+    println!("cargo::rustc-check-cfg=cfg(feature, values(\"1.12.0\"))");
+
+    for (key, _) in std::env::vars() {
+        if key.starts_with("DEP_HDF5_VERSION_") {
+            let version = key.trim_start_matches("DEP_HDF5_VERSION_").replace("_", ".");
+            println!("cargo::rustc-cfg=feature=\"{version}\"");
+        }
+    }
 }
diff --git a/hdf5-types/src/dyn_value.rs b/hdf5-types/src/dyn_value.rs
@@ -703,6 +703,7 @@ impl<'a> DynValue<'a> {
             FixedUnicode(_) => DynFixedString::new(buf, true).into(),
             VarLenAscii => DynVarLenString::new(buf, false).into(),
             VarLenUnicode => DynVarLenString::new(buf, true).into(),
+            Reference(_x) => todo!(),
         }
     }
 }
diff --git a/hdf5-types/src/h5type.rs b/hdf5-types/src/h5type.rs
@@ -4,6 +4,7 @@ use std::os::raw::c_void;
 use std::ptr;
 
 use crate::array::VarLenArray;
+use crate::references::Reference;
 use crate::string::{FixedAscii, FixedUnicode, VarLenAscii, VarLenUnicode};
 
 #[allow(non_camel_case_types)]
@@ -160,6 +161,7 @@ pub enum TypeDescriptor {
     VarLenArray(Box<Self>),
     VarLenAscii,
     VarLenUnicode,
+    Reference(Reference),
 }
 
 impl Display for TypeDescriptor {
@@ -186,6 +188,10 @@ impl Display for TypeDescriptor {
             TypeDescriptor::VarLenArray(ref tp) => write!(f, "[{}] (var len)", tp),
             TypeDescriptor::VarLenAscii => write!(f, "string (var len)"),
             TypeDescriptor::VarLenUnicode => write!(f, "unicode (var len)"),
+            TypeDescriptor::Reference(Reference::Object) => write!(f, "reference (object)"),
+            TypeDescriptor::Reference(Reference::Region) => write!(f, "reference (region)"),
+            #[cfg(feature = "1.12.0")]
+            TypeDescriptor::Reference(Reference::Std) => write!(f, "reference"),
         }
     }
 }
@@ -202,6 +208,7 @@ impl TypeDescriptor {
             Self::FixedAscii(len) | Self::FixedUnicode(len) => len,
             Self::VarLenArray(_) => mem::size_of::<hvl_t>(),
             Self::VarLenAscii | Self::VarLenUnicode => mem::size_of::<*const u8>(),
+            Self::Reference(reftyp) => reftyp.size(),
         }
     }
 
@@ -340,7 +347,7 @@ unsafe impl<T: H5Type, const N: usize> H5Type for [T; N] {
     }
 }
 
-unsafe impl<T: Copy + H5Type> H5Type for VarLenArray<T> {
+unsafe impl<T: H5Type + Copy> H5Type for VarLenArray<T> {
     #[inline]
     fn type_descriptor() -> TypeDescriptor {
         TypeDescriptor::VarLenArray(Box::new(<T as H5Type>::type_descriptor()))
diff --git a/hdf5-types/src/lib.rs b/hdf5-types/src/lib.rs
@@ -20,6 +20,7 @@ extern crate quickcheck;
 mod array;
 pub mod dyn_value;
 mod h5type;
+pub mod references;
 mod string;
 
 #[cfg(feature = "complex")]
@@ -30,6 +31,7 @@ pub use self::dyn_value::{DynValue, OwnedDynValue};
 pub use self::h5type::{
     CompoundField, CompoundType, EnumMember, EnumType, FloatSize, H5Type, IntSize, TypeDescriptor,
 };
+pub use self::references::Reference;
 pub use self::string::{FixedAscii, FixedUnicode, StringError, VarLenAscii, VarLenUnicode};
 
 pub(crate) unsafe fn malloc(n: usize) -> *mut core::ffi::c_void {
diff --git a/hdf5-types/src/references.rs b/hdf5-types/src/references.rs
@@ -0,0 +1,22 @@
+//! Types for references.
+
+use std::mem;
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum Reference {
+    Object,
+    Region,
+    #[cfg(feature = "1.12.0")]
+    Std,
+}
+
+impl Reference {
+    pub fn size(self) -> usize {
+        match self {
+            Self::Object => mem::size_of::<hdf5_sys::h5r::hobj_ref_t>(),
+            Self::Region => mem::size_of::<hdf5_sys::h5r::hdset_reg_ref_t>(),
+            #[cfg(feature = "1.12.0")]
+            Self::Std => mem::size_of::<hdf5_sys::h5r::H5R_ref_t>(),
+        }
+    }
+}
diff --git a/hdf5/src/globals.rs b/hdf5/src/globals.rs
@@ -77,6 +77,8 @@ link_hid!(H5T_STD_B64BE, h5t::H5T_STD_B64BE);
 link_hid!(H5T_STD_B64LE, h5t::H5T_STD_B64LE);
 link_hid!(H5T_STD_REF_OBJ, h5t::H5T_STD_REF_OBJ);
 link_hid!(H5T_STD_REF_DSETREG, h5t::H5T_STD_REF_DSETREG);
+#[cfg(feature = "1.12.0")]
+link_hid!(H5T_STD_REF, h5t::H5T_STD_REF);
 link_hid!(H5T_UNIX_D32BE, h5t::H5T_UNIX_D32BE);
 link_hid!(H5T_UNIX_D32LE, h5t::H5T_UNIX_D32LE);
 link_hid!(H5T_UNIX_D64BE, h5t::H5T_UNIX_D64BE);
diff --git a/hdf5/src/hl.rs b/hdf5/src/hl.rs
@@ -11,6 +11,7 @@ pub mod group;
 pub mod location;
 pub mod object;
 pub mod plist;
+pub mod references;
 pub mod selection;
 
 pub use self::{
diff --git a/hdf5/src/hl/datatype.rs b/hdf5/src/hl/datatype.rs
@@ -410,6 +410,16 @@ impl Datatype {
                 }
                 TD::VarLenAscii => string_type(None, H5T_cset_t::H5T_CSET_ASCII),
                 TD::VarLenUnicode => string_type(None, H5T_cset_t::H5T_CSET_UTF8),
+                #[cfg(feature = "1.12.0")]
+                TD::Reference(hdf5_types::Reference::Std) => {
+                    Ok(h5try!(H5Tcopy(*crate::globals::H5T_STD_REF)))
+                }
+                TD::Reference(hdf5_types::Reference::Object) => {
+                    Ok(h5try!(H5Tcopy(*crate::globals::H5T_STD_REF_OBJ)))
+                }
+                TD::Reference(hdf5_types::Reference::Region) => {
+                    Ok(h5try!(H5Tcopy(*crate::globals::H5T_STD_REF_DSETREG)))
+                }
             }
         });
 
diff --git a/hdf5/src/hl/location.rs b/hdf5/src/hl/location.rs
@@ -146,6 +146,20 @@ impl Location {
     pub fn open_by_token(&self, token: LocationToken) -> Result<Self> {
         H5O_open_by_token(self.id(), token)
     }
+
+    /// Generate a [object reference](ObjectReference) to the object for a reference storage.
+    ///
+    /// This can be a group, dataset or datatype. Other objects are not supported.
+    pub fn reference<R: ObjectReference>(&self, name: &str) -> Result<R> {
+        R::create(self, name)
+    }
+
+    /// Get a reference back to the referenced object from a standard reference.
+    ///
+    /// This can be called against any object in the same file as the referenced object.
+    pub fn dereference<R: ObjectReference>(&self, reference: &R) -> Result<ReferencedObject> {
+        reference.dereference(self)
+    }
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/hdf5/src/hl/references.rs b/hdf5/src/hl/references.rs
@@ -0,0 +1,61 @@
+use crate::internal_prelude::*;
+use crate::Location;
+
+mod legacy;
+
+#[cfg(feature = "1.12.1")]
+mod standard;
+
+use hdf5_sys::h5o::H5O_type_t;
+use hdf5_sys::h5r::H5R_type_t;
+
+pub use legacy::ObjectReference1;
+#[cfg(feature = "1.12.1")]
+pub use standard::ObjectReference2;
+
+mod private {
+    pub trait ObjectReferencePrivate {}
+}
+
+/// The trait for all object references. This provides a common interface
+/// over the legacy and standard reference types.
+///
+/// This trait is sealed and cannot be implemented for types outside `hdf5::hl`.
+pub trait ObjectReference: Sized + H5Type + private::ObjectReferencePrivate {
+    const REF_TYPE: H5R_type_t;
+    fn ptr(&self) -> *const c_void;
+
+    /// Get the type of the object that the reference points in the same space as the provided location.
+    fn get_object_type(&self, location: &Location) -> Result<H5O_type_t>;
+
+    /// Create a new reference in the same structure as the location provided.
+    fn create(location: &Location, name: &str) -> Result<Self>;
+
+    /// Dereference the object reference in the space provided.
+    fn dereference(&self, location: &Location) -> Result<ReferencedObject>;
+}
+/// The result of dereferencing an [object reference](ObjectReference).
+///
+/// Each variant represents a different type of object that can be referenced by a [ObjectReference].
+#[derive(Clone, Debug)]
+pub enum ReferencedObject {
+    Group(Group),
+    Dataset(Dataset),
+    Datatype(Datatype),
+}
+
+impl ReferencedObject {
+    pub fn from_type_and_id(object_type: H5O_type_t, object_id: hid_t) -> Result<Self> {
+        use hdf5_sys::h5o::H5O_type_t::*;
+        let referenced_object = match object_type {
+            H5O_TYPE_GROUP => ReferencedObject::Group(Group::from_id(object_id)?),
+            H5O_TYPE_DATASET => ReferencedObject::Dataset(Dataset::from_id(object_id)?),
+            H5O_TYPE_NAMED_DATATYPE => ReferencedObject::Datatype(Datatype::from_id(object_id)?),
+            #[cfg(feature = "1.12.0")]
+            H5O_TYPE_MAP => fail!("Can not create object from a map"),
+            H5O_TYPE_UNKNOWN => fail!("Unknown datatype"),
+            H5O_TYPE_NTYPES => fail!("hdf5 should not produce this type"),
+        };
+        Ok(referenced_object)
+    }
+}
diff --git a/hdf5/src/hl/references/legacy.rs b/hdf5/src/hl/references/legacy.rs
@@ -0,0 +1,72 @@
+//! The pre v1.12.0 reference types.
+
+use crate::internal_prelude::*;
+
+use hdf5_sys::{
+    h5o::H5O_type_t,
+    h5p::H5P_DEFAULT,
+    h5r::{hobj_ref_t, H5Rcreate, H5Rdereference, H5Rget_obj_type2},
+};
+use hdf5_types::H5Type;
+
+#[cfg(not(feature = "1.12.0"))]
+use hdf5_sys::h5r::H5R_OBJECT as H5R_OBJECT1;
+#[cfg(feature = "1.12.0")]
+use hdf5_sys::h5r::H5R_OBJECT1;
+
+use super::{private::ObjectReferencePrivate, ObjectReference};
+use crate::Location;
+
+#[repr(transparent)]
+#[derive(Debug, Copy, Clone)]
+pub struct ObjectReference1 {
+    inner: hobj_ref_t,
+}
+
+unsafe impl H5Type for ObjectReference1 {
+    fn type_descriptor() -> hdf5_types::TypeDescriptor {
+        hdf5_types::TypeDescriptor::Reference(hdf5_types::Reference::Object)
+    }
+}
+
+impl ObjectReferencePrivate for ObjectReference1 {}
+
+impl ObjectReference for ObjectReference1 {
+    const REF_TYPE: hdf5_sys::h5r::H5R_type_t = H5R_OBJECT1;
+
+    fn ptr(&self) -> *const c_void {
+        let pointer = std::ptr::addr_of!(self.inner);
+        pointer.cast()
+    }
+
+    fn create(location: &Location, name: &str) -> Result<Self> {
+        let mut ref_out: std::mem::MaybeUninit<hobj_ref_t> = std::mem::MaybeUninit::uninit();
+        let name = to_cstring(name)?;
+        h5call!(H5Rcreate(
+            ref_out.as_mut_ptr().cast(),
+            location.id(),
+            name.as_ptr(),
+            Self::REF_TYPE,
+            -1
+        ))?;
+        let reference = unsafe { ref_out.assume_init() };
+        Ok(Self { inner: reference })
+    }
+
+    fn get_object_type(&self, location: &Location) -> Result<hdf5_sys::h5o::H5O_type_t> {
+        let mut objtype = std::mem::MaybeUninit::<H5O_type_t>::uninit();
+        h5call!(H5Rget_obj_type2(location.id(), H5R_OBJECT1, self.ptr(), objtype.as_mut_ptr()))?;
+        let objtype = unsafe { objtype.assume_init() };
+        Ok(objtype)
+    }
+
+    fn dereference(&self, location: &Location) -> Result<ReferencedObject> {
+        let object_type = self.get_object_type(location)?;
+        #[cfg(feature = "1.10.0")]
+        let object_id =
+            h5call!(H5Rdereference(location.id(), H5P_DEFAULT, H5R_OBJECT1, self.ptr()))?;
+        #[cfg(not(feature = "1.10.0"))]
+        let object_id = h5call!(H5Rdereference(location.id(), H5R_OBJECT1, self.ptr()))?;
+        ReferencedObject::from_type_and_id(object_type, object_id)
+    }
+}
diff --git a/hdf5/src/hl/references/standard.rs b/hdf5/src/hl/references/standard.rs
diff --git a/hdf5/src/lib.rs b/hdf5/src/lib.rs
diff --git a/hdf5/tests/test_object_references.rs b/hdf5/tests/test_object_references.rs

Original file line number	Diff line number	Diff line change
`@@ -703,6 +703,7 @@ impl<'a> DynValue<'a> {`
`703`	`703`	`FixedUnicode(_) => DynFixedString::new(buf, true).into(),`
`704`	`704`	`VarLenAscii => DynVarLenString::new(buf, false).into(),`
`705`	`705`	`VarLenUnicode => DynVarLenString::new(buf, true).into(),`
	`706`	`+ Reference(_x) => todo!(),`
`706`	`707`	`}`
`707`	`708`	`}`
`708`	`709`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ use std::os::raw::c_void;`
`4`	`4`	`use std::ptr;`
`5`	`5`
`6`	`6`	`use crate::array::VarLenArray;`
	`7`	`+use crate::references::Reference;`
`7`	`8`	`use crate::string::{FixedAscii, FixedUnicode, VarLenAscii, VarLenUnicode};`
`8`	`9`
`9`	`10`	`#[allow(non_camel_case_types)]`
`@@ -160,6 +161,7 @@ pub enum TypeDescriptor {`
`160`	`161`	`VarLenArray(Box<Self>),`
`161`	`162`	`VarLenAscii,`
`162`	`163`	`VarLenUnicode,`
	`164`	`+ Reference(Reference),`
`163`	`165`	`}`
`164`	`166`
`165`	`167`	`impl Display for TypeDescriptor {`
`@@ -186,6 +188,10 @@ impl Display for TypeDescriptor {`
`186`	`188`	`TypeDescriptor::VarLenArray(ref tp) => write!(f, "[{}] (var len)", tp),`
`187`	`189`	`TypeDescriptor::VarLenAscii => write!(f, "string (var len)"),`
`188`	`190`	`TypeDescriptor::VarLenUnicode => write!(f, "unicode (var len)"),`
	`191`	`+ TypeDescriptor::Reference(Reference::Object) => write!(f, "reference (object)"),`
	`192`	`+ TypeDescriptor::Reference(Reference::Region) => write!(f, "reference (region)"),`
	`193`	`+ #[cfg(feature = "1.12.0")]`
	`194`	`+ TypeDescriptor::Reference(Reference::Std) => write!(f, "reference"),`
`189`	`195`	`}`
`190`	`196`	`}`
`191`	`197`	`}`
`@@ -202,6 +208,7 @@ impl TypeDescriptor {`
`202`	`208`	`Self::FixedAscii(len) \| Self::FixedUnicode(len) => len,`
`203`	`209`	`Self::VarLenArray(_) => mem::size_of::<hvl_t>(),`
`204`	`210`	`Self::VarLenAscii \| Self::VarLenUnicode => mem::size_of::<*const u8>(),`
	`211`	`+ Self::Reference(reftyp) => reftyp.size(),`
`205`	`212`	`}`
`206`	`213`	`}`
`207`	`214`
`@@ -340,7 +347,7 @@ unsafe impl<T: H5Type, const N: usize> H5Type for [T; N] {`
`340`	`347`	`}`
`341`	`348`	`}`
`342`	`349`
`343`		`-unsafe impl<T: Copy + H5Type> H5Type for VarLenArray<T> {`
	`350`	`+unsafe impl<T: H5Type + Copy> H5Type for VarLenArray<T> {`
`344`	`351`	`#[inline]`
`345`	`352`	`fn type_descriptor() -> TypeDescriptor {`
`346`	`353`	`TypeDescriptor::VarLenArray(Box::new(<T as H5Type>::type_descriptor()))`