snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Give the allocator to the tracer when necessary

Browse Source
This commit is contained in:
Clément Renault 2024-01-22 14:32:57 +01:00 committed by Louis Dureuil
parent 6cf703387d
commit 83fb2949c3
No known key found for this signature in database
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meilisearch/src/main.rs
View File

@ -35,8 +35,10 @@ fn setup(opt: &Opt) -> anyhow::Result<()> {
let file = std::fs::File::create(&trace_file) let file = std::fs::File::create(&trace_file)
.with_context(|| format!("could not create trace file at '{}'", trace_file))?; .with_context(|| format!("could not create trace file at '{}'", trace_file))?;
// TODO kero: Pass the allocator stats to Trace here #[cfg(not(feature = "stats_alloc"))]
let (mut trace, layer) = tracing_trace::Trace::new(file); let (mut trace, layer) = tracing_trace::Trace::new(file);
#[cfg(feature = "stats_alloc")]
let (mut trace, layer) = tracing_trace::Trace::with_stats_alloc(file, &ALLOC);
let subscriber = tracing_subscriber::registry() let subscriber = tracing_subscriber::registry()
.with( .with(

5
tracing-trace/src/layer.rs
View File

@ -83,7 +83,7 @@ enum OpaqueIdentifier {
Call(tracing::callsite::Identifier), Call(tracing::callsite::Identifier),
} }
impl TraceLayer { impl<A: GlobalAlloc> TraceLayer<A> {
fn resource_id(&self, opaque: OpaqueIdentifier) -> Option<ResourceId> { fn resource_id(&self, opaque: OpaqueIdentifier) -> Option<ResourceId> {
self.callsites.read().unwrap().get(&opaque).copied() self.callsites.read().unwrap().get(&opaque).copied()
} }
@ -132,9 +132,10 @@ impl TraceLayer {
} }
} }
impl<S> Layer<S> for TraceLayer impl<S, A> Layer<S> for TraceLayer<A>
where where
S: Subscriber, S: Subscriber,
A: GlobalAlloc,
{ {
fn on_new_span(&self, attrs: &Attributes<'_>, id: &TracingId, _ctx: Context<'_, S>) { fn on_new_span(&self, attrs: &Attributes<'_>, id: &TracingId, _ctx: Context<'_, S>) {
let call_id = self let call_id = self