Measure memory usage of the Glean global object

Author: badboy

Cargo.lock

@@ -30,7 +30,7 @@ maintenance = { status = "actively-developed" }
 [dependencies]
 serde = { version = "1.0.104", features = ["derive"] }
 serde_json = "1.0.44"
-rkv = { version = "0.20.0", default-features = false }
+rkv = { version = "0.20.0", default-features = false, features = ["malloc-size-of"]}
 bincode = "1.2.1"
 log = "0.4.8"
 uuid = { version = "1.0", features = ["v4"] }
@@ -44,7 +44,7 @@ uniffi = { version = "0.29.3", default-features = false }
 time = "0.3"
 env_logger = { version = "0.10.0", default-features = false, optional = true }
 malloc_size_of_derive = "0.1.3"
-malloc_size_of = { version = "0.2.1", package = "wr_malloc_size_of", default-features = false, features = ["once_cell"] }
+malloc_size_of = { version = "0.2.2", package = "wr_malloc_size_of", default-features = false, features = ["once_cell"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = { version = "0.12.0", default-features = false }

glean-core/Cargo.toml

@@ -382,5 +382,12 @@ pub fn test_get_distribution() -> DistributionMetrics {
     glean_core::glean_test_get_distribution()
 }
 
+/// Return the heap usage of the `Glean` object and all descendant heap-allocated structures.
+///
+/// Value is in bytes.
+pub fn alloc_size(ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
+    glean_core::alloc_size(ops)
+}
+
 #[cfg(test)]
 mod test;

glean-core/rlb/src/lib.rs

@@ -145,30 +145,27 @@ pub struct Database {
 }
 
 impl MallocSizeOf for Database {
-    fn size_of(&self, _ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
+    fn size_of(&self, ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
         // TODO(bug 1960592): Fill in gaps.
 
-        /*
         let mut n = 0;
 
-        n += 0; // self.rkv.size_of(ops) -- not implemented.
-        n += 0; // self.user_store.size_of(ops) -- not implemented.
+        n += self.rkv.size_of(ops);
+        n += self.user_store.size_of(ops);
+        n += self.ping_store.size_of(ops);
+        n += self.application_store.size_of(ops);
 
         n += self
             .ping_lifetime_data
             .as_ref()
-            .map(|_data| {
+            .map(|data| {
                 // TODO(bug 1960592): servo's malloc_size_of implements it for BTreeMap.
-                //let lock = data.read().unwrap();
-                //(*lock).size_of(ops)
-                0
+                let lock = data.read().unwrap();
+                (*lock).size_of(ops)
             })
             .unwrap_or(0);
 
         n
-        */
-
-        0
     }
 }
 

glean-core/src/database/mod.rs

@@ -577,6 +577,14 @@ fn initialize_inner(
     }
 }
 
+/// Return the heap usage of the `Glean` object and all descendant heap-allocated structures.
+///
+/// Value is in bytes.
+pub fn alloc_size(ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
+    use malloc_size_of::MallocSizeOf;
+    core::with_glean(|glean| glean.size_of(ops))
+}
+
 /// TEST ONLY FUNCTION
 /// Waits on all the glean.init threads' join handles.
 pub fn join_init() {

glean-core/src/lib.rs

@@ -257,8 +257,8 @@ user-login = "epage"
 user-name = "Ed Page"
 
 [[publisher.wr_malloc_size_of]]
-version = "0.2.1"
-when = "2025-05-07"
+version = "0.2.2"
+when = "2025-06-24"
 user-id = 48
 user-login = "badboy"
 user-name = "Jan-Erik Rediger"