Use const thread_local for reduced init overhead

microsoft · Nov 21, 2024 · 1f524ed · 1f524ed
1 parent 45f4fc6
commit 1f524ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/native/common_schema/etw_cs.rs b/src/native/common_schema/etw_cs.rs
@@ -12,7 +12,7 @@ use tracelogging::*;
 use tracelogging_dynamic::EventBuilder;
 use tracing_subscriber::registry::{LookupSpan, SpanRef};
 
-thread_local! {static EBW: std::cell::RefCell<EventBuilder>  = RefCell::new(EventBuilder::new());}
+thread_local! {static EBW: RefCell<EventBuilder>  = const { RefCell::new(EventBuilder::new());} }
 
 pub(crate) struct CommonSchemaPartCBuilder<'a> {
     pub(crate) eb: &'a mut EventBuilder,

diff --git a/src/native/common_schema/user_events_cs.rs b/src/native/common_schema/user_events_cs.rs
@@ -13,7 +13,7 @@ use std::{
 };
 use tracing_subscriber::registry::{LookupSpan, SpanRef};
 
-thread_local! {static EBW: std::cell::RefCell<EventBuilder>  = RefCell::new(EventBuilder::new());}
+thread_local! {static EBW: RefCell<EventBuilder>  = const { RefCell::new(EventBuilder::new());} }
 
 pub(crate) struct CommonSchemaPartCBuilder<'a> {
     pub(crate) eb: &'a mut EventBuilder,

diff --git a/src/native/etw.rs b/src/native/etw.rs
@@ -13,7 +13,7 @@ pub(crate) static mut _start__etw_kw: usize = usize::from_ne_bytes(*b"RSETW000")
 #[link_section = ".rsdata$zRSETW9"]
 pub(crate) static mut _stop__etw_kw: usize = usize::from_ne_bytes(*b"RSETW999");
 
-thread_local! {static EBW: std::cell::RefCell<EventBuilder>  = RefCell::new(EventBuilder::new());}
+thread_local! {static EBW: RefCell<EventBuilder>  = const { RefCell::new(EventBuilder::new());} }
 
 struct Win32SystemTime {
     st: [u16; 8],

diff --git a/src/native/user_events.rs b/src/native/user_events.rs
@@ -17,7 +17,7 @@ extern "C" {
 #[used]
 static mut ETW_META_PTR: *const crate::_details::EventMetadata = core::ptr::null();
 
-thread_local! {static EBW: std::cell::RefCell<EventBuilder>  = RefCell::new(EventBuilder::new());}
+thread_local! {static EBW: RefCell<EventBuilder>  = const { RefCell::new(EventBuilder::new());} }
 
 impl<T> AddFieldAndValue<T> for &'_ mut eventheader_dynamic::EventBuilder {
     fn add_field_value(&mut self, fv: &FieldAndValue) {