Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Remove incorrect proof about Jemalloc #3982

Merged
merged 3 commits into from
Oct 1, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions node/overseer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -518,18 +518,36 @@ where
}
let subsystem_meters = overseer.map_subsystems(ExtractNameAndMeters);

let memory_stats =
MemoryAllocationTracker::new().expect("Jemalloc is the default allocator. qed");

let metronome = Metronome::new(std::time::Duration::from_millis(950)).for_each(move |_| {
match memory_stats.snapshot() {
Ok(memory_stats_snapshot) => {
tracing::trace!(target: LOG_TARGET, "memory_stats: {:?}", &memory_stats_snapshot);
metronome_metrics.memory_stats_snapshot(memory_stats_snapshot);
let collect_memory_stats: Box<dyn Fn(&OverseerMetrics) + Send> =
match MemoryAllocationTracker::new() {
Ok(memory_stats) =>
Box::new(move |metrics: &OverseerMetrics| match memory_stats.snapshot() {
Ok(memory_stats_snapshot) => {
tracing::trace!(
target: LOG_TARGET,
"memory_stats: {:?}",
&memory_stats_snapshot
);
metrics.memory_stats_snapshot(memory_stats_snapshot);
},
Err(e) => tracing::debug!(
target: LOG_TARGET,
"Failed to obtain memory stats: {:?}",
e
),
}),
Err(_) => {
tracing::debug!(
target: LOG_TARGET,
"Memory allocation tracking is not supported by the allocator.",
);

Box::new(|_| {})
},
};

Err(e) => tracing::debug!(target: LOG_TARGET, "Failed to obtain memory stats: {:?}", e),
}
let metronome = Metronome::new(std::time::Duration::from_millis(950)).for_each(move |_| {
collect_memory_stats(&metronome_metrics);

// We combine the amount of messages from subsystems to the overseer
// as well as the amount of messages from external sources to the overseer
Expand Down