1 files changed, 39 insertions, 1 deletions
diff --git a/rust/src/ffi.rs b/rust/src/ffi.rs
index d337df34..b6124dd4 100644
--- a/rust/src/ffi.rs
+++ b/rust/src/ffi.rs
@@ -20,7 +20,7 @@ macro_rules! ffi_wrap {
         use std::process;
 
         panic::catch_unwind(|| $b).unwrap_or_else(|_| {
-            log::error!("ffi callback caught panic: {}", $n);
+            tracing::error!("ffi callback caught panic: {}", $n);
             process::abort()
         })
     }};
@@ -30,3 +30,41 @@ pub(crate) fn time_from_bn(timestamp: u64) -> SystemTime {
     let m = Duration::from_secs(timestamp);
     UNIX_EPOCH + m
 }
+
+#[macro_export]
+macro_rules! ffi_span {
+    ($name:expr, $bv:expr) => {{
+        use $crate::binary_view::BinaryViewExt;
+        #[allow(unused_imports)]
+        use $crate::file_metadata::FileMetadata;
+        tracing::info_span!($name, session_id = $bv.file().session_id().0).entered()
+    }};
+    ($name:expr) => {
+        tracing::info_span!($name).entered()
+    };
+}
+
+macro_rules! new_id_type {
+    ($name:ident, $inner_type:ty) => {
+        #[derive(std::fmt::Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+        pub struct $name(pub $inner_type);
+
+        impl From<$inner_type> for $name {
+            fn from(value: $inner_type) -> Self {
+                Self(value)
+            }
+        }
+
+        impl From<$name> for $inner_type {
+            fn from(value: $name) -> Self {
+                value.0
+            }
+        }
+
+        impl std::fmt::Display for $name {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                write!(f, "{}", self.0)
+            }
+        }
+    };
+}