1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
// ---------------- [ File: bitcoin-mem/src/for_amo.rs ]
crate::ix!();
// -----------------------------------------------------------------------------
// UPDATED impl DynamicUsage for Amo<T>
// -----------------------------------------------------------------------------
impl<T> DynamicUsage for Amo<T> {
#[inline]
fn dynamic_usage(&self) -> usize {
// Amo<T> is `Arc<RwLock<Option<T>>>`
let header_bytes = 2 * core::mem::size_of::<usize>(); // Arc header
let payload = core::mem::size_of::<parking_lot::RwLock<Option<T>>>(); // lock + option
let total = header_bytes + payload;
trace!(
"DynamicUsage<Amo<{}>> header={} payload={} total={}",
core::any::type_name::<T>(),
header_bytes,
payload,
total
);
malloc_usage(total)
}
}
// -----------------------------------------------------------------------------
// UPDATED impl RecursiveDynamicUsage for Amo<X>
// -----------------------------------------------------------------------------
impl<X> RecursiveDynamicUsage for Amo<X>
where
X: RecursiveDynamicUsage + DynamicUsage,
{
fn recursive_dynamic_usage(&self) -> usize {
let own = DynamicUsage::dynamic_usage(self);
let inner = {
// work with the outer `Option<X>`
let guard = self.getopt(); // &Option<X>
guard
.as_ref()
.map(recursive_dynamic_usage) // recurse if Some
.unwrap_or(0)
};
trace!(
"RecursiveDynamicUsage<Amo<{}>> own={} inner={} total={}",
core::any::type_name::<X>(),
own,
inner,
own + inner
);
own + inner
}
}
#[cfg(test)]
mod memory_usage_tests {
use super::*;
use std::collections::{HashMap, HashSet};
use std::sync::Arc;
use tracing::{info, trace};
use core::mem::size_of;
// ────────────────────────────────────────────────────────────
// NEW: bring the traits into scope so method‑call syntax works
// ────────────────────────────────────────────────────────────
use crate::dynamic_usage::DynamicUsage;
use crate::incremental_dynamic_usage::IncrementalDynamicUsage;
// -------------------------------------------------------------------------
// Helper types
// -------------------------------------------------------------------------
#[derive(Default)]
struct Dummy;
impl DynamicUsage for Dummy {
#[inline]
fn dynamic_usage(&self) -> usize { 0 }
}
impl RecursiveDynamicUsage for Dummy {
fn recursive_dynamic_usage(&self) -> usize { 0 }
}
// -------------------------------------------------------------------------
// Primitive & pointer
// -------------------------------------------------------------------------
#[traced_test]
fn primitive_and_pointer_usage_is_zero() {
assert_eq!(123_i32.dynamic_usage(), 0);
assert_eq!(3.14_f64.dynamic_usage(), 0);
let p: *const i32 = core::ptr::null();
assert_eq!(p.dynamic_usage(), 0);
}
// -------------------------------------------------------------------------
// malloc_usage rounding
// -------------------------------------------------------------------------
#[traced_test]
fn malloc_usage_alignment() {
let align = if size_of::<*const ()>() == 8 { 16 } else { 8 };
for bytes in [1, 8, 15, 32, 63, 128] {
let r = malloc_usage(bytes);
assert!(r >= bytes && r % align == 0);
}
}
// -------------------------------------------------------------------------
// Vec<T>
// -------------------------------------------------------------------------
#[traced_test]
fn vec_usage_by_capacity() {
const CAP: usize = 10;
let v: Vec<u64> = Vec::with_capacity(CAP);
let expect = malloc_usage(CAP * size_of::<u64>());
assert_eq!(v.dynamic_usage(), expect);
}
// -------------------------------------------------------------------------
// Box<T>
// -------------------------------------------------------------------------
#[traced_test]
fn box_usage_exact() {
let bx = Box::new(42_u32);
assert_eq!(bx.dynamic_usage(), malloc_usage(size_of::<u32>()));
}
// -------------------------------------------------------------------------
// Arc<T>
// -------------------------------------------------------------------------
#[traced_test]
fn arc_usage_header_plus_payload() {
let a = Arc::new(7_u64);
let expect = malloc_usage(2 * size_of::<usize>() + size_of::<u64>());
assert_eq!(a.dynamic_usage(), expect);
}
// -------------------------------------------------------------------------
// Amo<T>
// -------------------------------------------------------------------------
#[traced_test]
fn amo_usage_and_recursive_none() {
let amo: Amo<Dummy> = Amo::default();
assert_eq!(
recursive_dynamic_usage(&amo),
amo.dynamic_usage()
);
}
#[traced_test]
fn amo_usage_and_recursive_with_inner() {
let amo: Amo<Arc<Dummy>> = Amo::default();
// store a value
{
let mut g = amo.getopt_mut();
*g = Some(Arc::new(Dummy::default()));
}
let own = amo.dynamic_usage();
let inner = {
// Arc header + Dummy (0)
malloc_usage(2 * size_of::<usize>() + size_of::<Dummy>())
};
assert_eq!(recursive_dynamic_usage(&amo), own + inner);
}
// -------------------------------------------------------------------------
// HashSet / HashMap incremental (raw containers)
// -------------------------------------------------------------------------
#[traced_test]
fn hashset_incremental() {
let mut s: HashSet<u32> = HashSet::new();
let before = s.dynamic_usage();
let inc = s.incremental_dynamic_usage();
s.insert(1);
assert_eq!(s.dynamic_usage() - before, inc);
}
#[traced_test]
fn hashmap_incremental() {
let mut m: HashMap<u32, u32> = HashMap::new();
let before = m.dynamic_usage();
let inc = m.incremental_dynamic_usage();
m.insert(1, 2);
assert_eq!(m.dynamic_usage() - before, inc);
}
// -------------------------------------------------------------------------
// HashSet / HashMap incremental (inside Arc)
// -------------------------------------------------------------------------
#[traced_test]
fn hashset_incremental_arc() {
let mut set: Arc<HashSet<u32>> = Arc::new(HashSet::new());
let inc = set.incremental_dynamic_usage();
let before = (*set).dynamic_usage();
Arc::make_mut(&mut set).insert(1);
let after = (*set).dynamic_usage();
info!(
"Arc<HashSet> node_inc={}, before={}, after={}, delta={}",
inc, before, after, after - before
);
assert_eq!(after - before, inc);
}
#[traced_test]
fn hashmap_incremental_arc() {
let mut map: Arc<HashMap<u32, u32>> = Arc::new(HashMap::new());
let inc = map.incremental_dynamic_usage();
let before = (*map).dynamic_usage();
Arc::make_mut(&mut map).insert(1, 2);
let after = (*map).dynamic_usage();
info!(
"Arc<HashMap> node_inc={}, before={}, after={}, delta={}",
inc, before, after, after - before
);
assert_eq!(after - before, inc);
}
}