Speed up Status parsing in release mode

Author: Marcondiro

src/error.rs

@@ -80,9 +80,6 @@ pub enum PtErrorCode {
     BadFile = pt_error_code_pte_bad_file as i32,
     /// Unknown cpu
     BadCpu = pt_error_code_pte_bad_cpu as i32,
-
-    /// No Error Information available
-    NoInfo = -1,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -162,14 +159,23 @@ pub(crate) fn ensure_ptok(code: i32) -> Result<(), PtError> {
 /// Returns the code as an unsigned int
 #[inline]
 pub(crate) fn extract_pterr(code: i32) -> Result<u32, PtError> {
-    match code {
-        x if x >= 0 => Ok(code as u32),
-        _ => Err(PtError::from_code(code)),
+    if code >= 0 {
+        Ok(code as u32)
+    } else {
+        Err(PtError::from_code(code))
     }
 }
 
 /// Turns a negative code into a PtErr and a positive code into a Status
 #[inline]
 pub(crate) fn extract_status_or_pterr(code: i32) -> Result<Status, PtError> {
-    extract_pterr(code).map(Status::from_bits_or_pterror)?
+    let raw_status = extract_pterr(code)?;
+    if cfg!(debug_assertions) {
+        Status::from_bits(raw_status).ok_or(PtError::new(
+            PtErrorCode::Internal,
+            "Unknown state returned by libipt, failed to convert to Status",
+        ))
+    } else {
+        Ok(Status::from_bits_retain(raw_status))
+    }
 }

src/status.rs

@@ -1,7 +1,6 @@
 // Certain casts are required only on Windows. Inform Clippy to ignore them.
 #![allow(clippy::unnecessary_cast)]
 
-use crate::error::{PtError, PtErrorCode};
 use bitflags::bitflags;
 use libipt_sys::{
     pt_status_flag_pts_eos, pt_status_flag_pts_event_pending, pt_status_flag_pts_ip_suppressed,
@@ -11,29 +10,16 @@ bitflags! {
     /// Status flags for various IntelPT actions
     #[derive(Debug, Clone, Copy)]
     pub struct Status: u32 {
-        /// There is no more trace data available.
-        const EOS = pt_status_flag_pts_eos as u32;
         /// There is an event pending.
         const EVENT_PENDING = pt_status_flag_pts_event_pending as u32;
         /// The address has been suppressed.
         const IP_SUPRESSED  = pt_status_flag_pts_ip_suppressed as u32;
+        /// There is no more trace data available.
+        const EOS = pt_status_flag_pts_eos as u32;
     }
 }
 
 impl Status {
-    pub(crate) fn from_bits_or_pterror(pt_status: u32) -> Result<Self, PtError> {
-        Status::from_bits(pt_status).ok_or(PtError::new(
-            PtErrorCode::Internal,
-            "Unknown state returned by libipt, failed to convert to Status",
-        ))
-    }
-
-    /// There is no more trace data available.
-    #[must_use]
-    pub const fn eos(&self) -> bool {
-        self.contains(Status::EOS)
-    }
-
     /// There is an event pending.
     #[must_use]
     pub const fn event_pending(&self) -> bool {
@@ -45,4 +31,10 @@ impl Status {
     pub const fn ip_supressed(&self) -> bool {
         self.contains(Status::IP_SUPRESSED)
     }
+
+    /// There is no more trace data available.
+    #[must_use]
+    pub const fn eos(&self) -> bool {
+        self.contains(Status::EOS)
+    }
 }