[Rust] Enter more session scoped tracing spans for debug info and binary view callbacks

Author: emesare

rust/src/custom_binary_view.rs

@@ -48,12 +48,10 @@ where
     where
         T: CustomBinaryViewType,
     {
-        ffi_wrap!("BinaryViewTypeBase::is_valid_for", unsafe {
-            let view_type = &*(ctxt as *mut T);
-            let data = BinaryView::ref_from_raw(BNNewViewReference(data));
-
-            view_type.is_valid_for(&data)
-        })
+        let view_type = unsafe { &*(ctxt as *mut T) };
+        let data = unsafe { BinaryView::ref_from_raw(BNNewViewReference(data)) };
+        let _span = ffi_span!("BinaryViewTypeBase::is_valid_for", data);
+        view_type.is_valid_for(&data)
     }
 
     extern "C" fn cb_deprecated<T>(ctxt: *mut c_void) -> bool
@@ -89,6 +87,7 @@ where
                 actual_parent: &data,
             };
 
+            let _span = ffi_span!("BinaryViewTypeBase::create", data);
             match view_type.create_custom_view(&data, builder) {
                 Ok(bv) => {
                     // force a leak of the Ref; failure to do this would result
@@ -114,6 +113,7 @@ where
                 actual_parent: &data,
             };
 
+            let _span = ffi_span!("BinaryViewTypeBase::parse", data);
             match view_type.parse_custom_view(&data, builder) {
                 Ok(bv) => {
                     // force a leak of the Ref; failure to do this would result
@@ -134,6 +134,7 @@ where
             let view_type = &*(ctxt as *mut T);
             let data = BinaryView::ref_from_raw(BNNewViewReference(data));
 
+            let _span = ffi_span!("BinaryViewTypeBase::load_settings", data);
             match view_type.load_settings_for_data(&data) {
                 Some(settings) => Ref::into_raw(settings).handle,
                 None => ptr::null_mut() as *mut _,

rust/src/debuginfo.rs

@@ -216,12 +216,10 @@ impl DebugInfoParser {
         where
             C: CustomDebugInfoParser,
         {
-            ffi_wrap!("CustomDebugInfoParser::is_valid", unsafe {
-                let cmd = &*(ctxt as *const C);
-                let view = BinaryView::ref_from_raw(view);
-
-                cmd.is_valid(&view)
-            })
+            let cmd = unsafe { &*(ctxt as *const C) };
+            let view = unsafe { BinaryView::ref_from_raw(view) };
+            let _span = ffi_span!("CustomDebugInfoParser::is_valid", view);
+            cmd.is_valid(&view)
         }
 
         extern "C" fn cb_parse_info<C>(
@@ -235,28 +233,27 @@ impl DebugInfoParser {
         where
             C: CustomDebugInfoParser,
         {
-            ffi_wrap!("CustomDebugInfoParser::parse_info", unsafe {
-                let cmd = &*(ctxt as *const C);
-                let view = BinaryView::ref_from_raw(view);
-                let debug_file = BinaryView::ref_from_raw(debug_file);
-                let mut debug_info = DebugInfo::ref_from_raw(debug_info);
-
-                cmd.parse_info(
-                    &mut debug_info,
-                    &view,
-                    &debug_file,
-                    Box::new(move |cur: usize, max: usize| match progress {
-                        Some(func) => {
-                            if func(progress_ctxt, cur, max) {
-                                Ok(())
-                            } else {
-                                Err(())
-                            }
+            let cmd = unsafe { &*(ctxt as *const C) };
+            let view = unsafe { BinaryView::ref_from_raw(view) };
+            let debug_file = unsafe { BinaryView::ref_from_raw(debug_file) };
+            let mut debug_info = unsafe { DebugInfo::ref_from_raw(debug_info) };
+
+            let _span = ffi_span!("CustomDebugInfoParser::parse_info", view);
+            cmd.parse_info(
+                &mut debug_info,
+                &view,
+                &debug_file,
+                Box::new(move |cur: usize, max: usize| match progress {
+                    Some(func) => unsafe {
+                        if func(progress_ctxt, cur, max) {
+                            Ok(())
+                        } else {
+                            Err(())
                         }
-                        _ => Ok(()),
-                    }),
-                )
-            })
+                    },
+                    _ => Ok(()),
+                }),
+            )
         }
 
         let name = name.to_cstr();