* feat: add memory footprint to /stats and dashboard Per-structure heap estimation (cache, blocklist, query log, SRTT, overrides) with process RSS via mach_task_basic_info / sysconf. Dashboard gets a 6th stat card and a sidebar breakdown panel with stacked bar visualization. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use phys_footprint on macOS to match Activity Monitor Switch from MACH_TASK_BASIC_INFO (resident_size) to TASK_VM_INFO (phys_footprint) which matches Activity Monitor's Memory column. Also: capacity-aware heap estimation, entry counts in memory payload, heap_bytes tests for all stores. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: remove redundant fields and fix naming in memory stats Remove duplicate entry counts from MemoryStats (already in parent StatsResponse), rename process_rss_bytes to process_memory_bytes to match macOS phys_footprint semantics, drop restating comments. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
237 lines
6.5 KiB
Rust
237 lines
6.5 KiB
Rust
use std::collections::HashMap;
|
|
use std::time::{Duration, Instant};
|
|
|
|
use crate::packet::DnsPacket;
|
|
use crate::question::QueryType;
|
|
use crate::record::DnsRecord;
|
|
|
|
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
|
pub enum DnssecStatus {
|
|
Secure,
|
|
Insecure,
|
|
Bogus,
|
|
#[default]
|
|
Indeterminate,
|
|
}
|
|
|
|
impl DnssecStatus {
|
|
pub fn as_str(&self) -> &'static str {
|
|
match self {
|
|
DnssecStatus::Secure => "secure",
|
|
DnssecStatus::Insecure => "insecure",
|
|
DnssecStatus::Bogus => "bogus",
|
|
DnssecStatus::Indeterminate => "indeterminate",
|
|
}
|
|
}
|
|
}
|
|
|
|
struct CacheEntry {
|
|
packet: DnsPacket,
|
|
inserted_at: Instant,
|
|
ttl: Duration,
|
|
dnssec_status: DnssecStatus,
|
|
}
|
|
|
|
/// DNS cache using a two-level map (domain -> query_type -> entry) so that
|
|
/// lookups can borrow `&str` instead of allocating a `String` key.
|
|
pub struct DnsCache {
|
|
entries: HashMap<String, HashMap<QueryType, CacheEntry>>,
|
|
entry_count: usize,
|
|
max_entries: usize,
|
|
min_ttl: u32,
|
|
max_ttl: u32,
|
|
}
|
|
|
|
impl DnsCache {
|
|
pub fn new(max_entries: usize, min_ttl: u32, max_ttl: u32) -> Self {
|
|
DnsCache {
|
|
entries: HashMap::new(),
|
|
entry_count: 0,
|
|
max_entries,
|
|
min_ttl,
|
|
max_ttl,
|
|
}
|
|
}
|
|
|
|
/// Read-only lookup — expired entries are left in place (cleaned up on insert).
|
|
pub fn lookup(&self, domain: &str, qtype: QueryType) -> Option<DnsPacket> {
|
|
self.lookup_with_status(domain, qtype).map(|(pkt, _)| pkt)
|
|
}
|
|
|
|
pub fn lookup_with_status(
|
|
&self,
|
|
domain: &str,
|
|
qtype: QueryType,
|
|
) -> Option<(DnsPacket, DnssecStatus)> {
|
|
let type_map = self.entries.get(domain)?;
|
|
let entry = type_map.get(&qtype)?;
|
|
|
|
let elapsed = entry.inserted_at.elapsed();
|
|
if elapsed >= entry.ttl {
|
|
return None;
|
|
}
|
|
|
|
let remaining_secs = (entry.ttl - elapsed).as_secs() as u32;
|
|
let remaining = remaining_secs.max(1);
|
|
|
|
let mut packet = entry.packet.clone();
|
|
adjust_ttls(&mut packet.answers, remaining);
|
|
adjust_ttls(&mut packet.authorities, remaining);
|
|
adjust_ttls(&mut packet.resources, remaining);
|
|
|
|
Some((packet, entry.dnssec_status))
|
|
}
|
|
|
|
pub fn insert(&mut self, domain: &str, qtype: QueryType, packet: &DnsPacket) {
|
|
self.insert_with_status(domain, qtype, packet, DnssecStatus::Indeterminate);
|
|
}
|
|
|
|
pub fn insert_with_status(
|
|
&mut self,
|
|
domain: &str,
|
|
qtype: QueryType,
|
|
packet: &DnsPacket,
|
|
dnssec_status: DnssecStatus,
|
|
) {
|
|
if self.entry_count >= self.max_entries {
|
|
self.evict_expired();
|
|
if self.entry_count >= self.max_entries {
|
|
return;
|
|
}
|
|
}
|
|
|
|
let min_ttl = extract_min_ttl(&packet.answers)
|
|
.unwrap_or(self.min_ttl)
|
|
.clamp(self.min_ttl, self.max_ttl);
|
|
|
|
let type_map = if let Some(existing) = self.entries.get_mut(domain) {
|
|
existing
|
|
} else {
|
|
self.entries.entry(domain.to_string()).or_default()
|
|
};
|
|
|
|
if !type_map.contains_key(&qtype) {
|
|
self.entry_count += 1;
|
|
}
|
|
|
|
type_map.insert(
|
|
qtype,
|
|
CacheEntry {
|
|
packet: packet.clone(),
|
|
inserted_at: Instant::now(),
|
|
ttl: Duration::from_secs(min_ttl as u64),
|
|
dnssec_status,
|
|
},
|
|
);
|
|
}
|
|
|
|
pub fn len(&self) -> usize {
|
|
self.entry_count
|
|
}
|
|
|
|
pub fn is_empty(&self) -> bool {
|
|
self.entry_count == 0
|
|
}
|
|
|
|
pub fn max_entries(&self) -> usize {
|
|
self.max_entries
|
|
}
|
|
|
|
pub fn clear(&mut self) {
|
|
self.entries.clear();
|
|
self.entry_count = 0;
|
|
}
|
|
|
|
pub fn heap_bytes(&self) -> usize {
|
|
let outer_slot = std::mem::size_of::<u64>()
|
|
+ std::mem::size_of::<String>()
|
|
+ std::mem::size_of::<HashMap<QueryType, CacheEntry>>()
|
|
+ 1;
|
|
let mut total = self.entries.capacity() * outer_slot;
|
|
for (domain, type_map) in &self.entries {
|
|
total += domain.capacity();
|
|
let inner_slot = std::mem::size_of::<u64>()
|
|
+ std::mem::size_of::<QueryType>()
|
|
+ std::mem::size_of::<CacheEntry>()
|
|
+ 1;
|
|
total += type_map.capacity() * inner_slot;
|
|
for entry in type_map.values() {
|
|
total += entry.packet.heap_bytes();
|
|
}
|
|
}
|
|
total
|
|
}
|
|
|
|
pub fn remove(&mut self, domain: &str) {
|
|
let domain_lower = domain.to_lowercase();
|
|
if let Some(type_map) = self.entries.remove(&domain_lower) {
|
|
self.entry_count -= type_map.len();
|
|
}
|
|
}
|
|
|
|
pub fn list(&self) -> Vec<CacheInfo> {
|
|
let mut result = Vec::new();
|
|
for (domain, type_map) in &self.entries {
|
|
for (qtype, entry) in type_map {
|
|
let elapsed = entry.inserted_at.elapsed();
|
|
if elapsed < entry.ttl {
|
|
let remaining = (entry.ttl - elapsed).as_secs() as u32;
|
|
result.push(CacheInfo {
|
|
domain: domain.clone(),
|
|
query_type: *qtype,
|
|
ttl_remaining: remaining,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
result
|
|
}
|
|
|
|
fn evict_expired(&mut self) {
|
|
let mut count = 0;
|
|
self.entries.retain(|_, type_map| {
|
|
let before = type_map.len();
|
|
type_map.retain(|_, entry| entry.inserted_at.elapsed() < entry.ttl);
|
|
count += before - type_map.len();
|
|
!type_map.is_empty()
|
|
});
|
|
self.entry_count -= count;
|
|
}
|
|
}
|
|
|
|
pub struct CacheInfo {
|
|
pub domain: String,
|
|
pub query_type: QueryType,
|
|
pub ttl_remaining: u32,
|
|
}
|
|
|
|
fn extract_min_ttl(records: &[DnsRecord]) -> Option<u32> {
|
|
records.iter().map(|r| r.ttl()).min()
|
|
}
|
|
|
|
fn adjust_ttls(records: &mut [DnsRecord], new_ttl: u32) {
|
|
for record in records.iter_mut() {
|
|
record.set_ttl(new_ttl);
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::packet::DnsPacket;
|
|
|
|
#[test]
|
|
fn heap_bytes_grows_with_entries() {
|
|
let mut cache = DnsCache::new(100, 1, 3600);
|
|
let empty = cache.heap_bytes();
|
|
let mut pkt = DnsPacket::new();
|
|
pkt.answers.push(DnsRecord::A {
|
|
domain: "example.com".into(),
|
|
addr: "1.2.3.4".parse().unwrap(),
|
|
ttl: 300,
|
|
});
|
|
cache.insert("example.com", QueryType::A, &pkt);
|
|
assert!(cache.heap_bytes() > empty);
|
|
}
|
|
}
|