xds module : trying to fix frame timing mismatch in regression test 106

Author: vatsalkeshav

src/rust/src/libccxr_exports/time.rs

@@ -275,7 +275,7 @@ pub unsafe fn write_back_to_common_timing_ctx(
 /// # Safety
 ///
 /// All the static variables should be initialized and in valid state.
-unsafe fn apply_timing_info() {
+pub(crate) unsafe fn apply_timing_info() {
     let Ok(mut timing_info) = GLOBAL_TIMING_INFO.write() else {
         // RwLock is poisoned, skip updating
         return;

src/rust/src/xds/handlers.rs

@@ -763,13 +763,13 @@ pub unsafe fn xds_do_current_and_future(
 
             // Extract program name from payload (bytes 2 to payload_length - 2)
             let name_end = (ctx.cur_xds_payload_length - 1) as usize;
-            let name_bytes: Vec<u8> = payload[2..name_end]
-                .iter()
-                .copied()
-                .filter(|&b| b != 0)
-                .collect();
+            let name_slice = &payload[2..name_end];
+            let name_bytes = match name_slice.iter().position(|&b| b == 0) {
+                Some(pos) => &name_slice[..pos],
+                None => name_slice,
+            };
 
-            let xds_program_name = String::from_utf8_lossy(&name_bytes).to_string();
+            let xds_program_name = String::from_utf8_lossy(name_bytes).to_string();
 
             debug!(
                 msg_type = DebugMessageFlag::DECODER_XDS;
@@ -953,13 +953,13 @@ pub unsafe fn xds_do_current_and_future(
 
             // Extract description from payload
             let desc_end = (ctx.cur_xds_payload_length - 1) as usize;
-            let desc_bytes: Vec<u8> = payload[2..desc_end]
-                .iter()
-                .copied()
-                .filter(|&b| b != 0)
-                .collect();
+            let desc_slice = &payload[2..desc_end];
+            let desc_bytes = match desc_slice.iter().position(|&b| b == 0) {
+                Some(pos) => &desc_slice[..pos],
+                None => desc_slice,
+            };
 
-            let xds_desc = String::from_utf8_lossy(&desc_bytes).to_string();
+            let xds_desc = String::from_utf8_lossy(desc_bytes).to_string();
 
             if !xds_desc.is_empty() {
                 let line_num = ctx.cur_xds_packet_type - 0x10; // XDS_TYPE_PROGRAM_DESC_1 = 0x10
@@ -1056,13 +1056,13 @@ pub unsafe fn xds_do_channel(
 
             // Extract network name from payload (bytes 2 to payload_length - 2)
             let name_end = (ctx.cur_xds_payload_length - 1) as usize;
-            let name_bytes: Vec<u8> = payload[2..name_end]
-                .iter()
-                .copied()
-                .filter(|&b| b != 0)
-                .collect();
+            let name_slice = &payload[2..name_end];
+            let name_bytes = match name_slice.iter().position(|&b| b == 0) {
+                Some(pos) => &name_slice[..pos],
+                None => name_slice,
+            };
 
-            let xds_network_name = String::from_utf8_lossy(&name_bytes).to_string();
+            let xds_network_name = String::from_utf8_lossy(name_bytes).to_string();
 
             debug!(
                 msg_type = DebugMessageFlag::DECODER_XDS;
@@ -1093,13 +1093,13 @@ pub unsafe fn xds_do_channel(
 
             // Extract call letters from payload (bytes 2 to payload_length - 2)
             let letters_end = (ctx.cur_xds_payload_length - 1) as usize;
-            let letters_bytes: Vec<u8> = payload[2..letters_end]
-                .iter()
-                .copied()
-                .filter(|&b| b != 0)
-                .collect();
+            let letters_slice = &payload[2..letters_end];
+            let letters_bytes = match letters_slice.iter().position(|&b| b == 0) {
+                Some(pos) => &letters_slice[..pos],
+                None => letters_slice,
+            };
 
-            let xds_call_letters = String::from_utf8_lossy(&letters_bytes).to_string();
+            let xds_call_letters = String::from_utf8_lossy(letters_bytes).to_string();
 
             debug!(
                 msg_type = DebugMessageFlag::DECODER_XDS;

src/rust/src/xds/mod.rs

@@ -18,6 +18,7 @@ pub mod types;
 use crate::bindings::*;
 use crate::ctorust::FromCType;
 use crate::libccxr_exports::time::generate_timing_context;
+use crate::libccxr_exports::time::apply_timing_info;
 use crate::xds::handlers::{do_end_of_xds, TS_START_OF_XDS};
 use crate::xds::types::{copy_xds_context_from_rust_to_c, CcxDecodersXdsContext};
 use std::os::raw::c_int;
@@ -42,6 +43,9 @@ pub unsafe extern "C" fn ccxr_do_end_of_xds(
         return;
     }
 
+    // trying to sync cb_field2 etc globals from C to GLOBAL_TIMING_INFO. hope this works
+    apply_timing_info();
+
     // Convert C context to Rust
     let mut rust_ctx = match CcxDecodersXdsContext::from_ctype(*ctx) {
         Some(c) => c,