Merge pull request #1002 from openmina/feat/malloc_size_of

Use malloc_sizeof

Author: vlad9486

Cargo.lock

@@ -58,23 +58,27 @@ poly-commitment = {git = "https://github.com/openmina/proof-systems", rev = "dec
 libp2p = { git = "https://github.com/openmina/rust-libp2p", rev = "5c44c7d9", default-features = false }
 vrf = { path = "vrf" }
 openmina-node-account = { path = "node/account" }
-redux = { git = "https://github.com/openmina/redux-rs.git", rev = "ab14890c", features = ["serde"] }
+redux = { git = "https://github.com/openmina/redux-rs.git", rev = "ab14890c", features = [
+    "serde",
+] }
 serde = "1.0.190"
 serde_json = "1.0.107"
 serde_with = { version = "3.7.0", features = ["hex"] }
 linkme = "0.3.22"
 static_assertions = "1.1.0"
 juniper = { version = "0.16" }
 
-ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std" ] }
+ark-ff = { version = "0.3.0", features = ["parallel", "asm", "std"] }
 # UNCOMMENTED_IN_CI ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std", "32x9" ] }
 
+graphannis-malloc_size_of = { git = "https://github.com/openmina/graphannis-malloc_size_of.git", rev = "f7da9f6" }
+graphannis-malloc_size_of_derive = { git = "https://github.com/openmina/graphannis-malloc_size_of_derive.git" }
 
 [profile.fuzz]
 inherits = "release"
 opt-level = 3
 debug = 2
-debug-assertions = true  # TODO: test and disable if too slow
+debug-assertions = true # TODO: test and disable if too slow
 overflow-checks = true
 lto = false
 panic = "abort"
@@ -87,7 +91,7 @@ ark-ec = { git = "https://github.com/openmina/algebra", rev = "aea157a" } # bran
 ark-poly = { git = "https://github.com/openmina/algebra", rev = "aea157a" } # branch: fix-openmina-webnode
 ark-serialize = { git = "https://github.com/openmina/algebra", rev = "aea157a" } # branch: fix-openmina-webnode
 
-num-bigint = { git = "https://github.com/openmina/num-bigint", rev = "8bb5ee4" } # branch: on-stack
+num-bigint = { git = "https://github.com/openmina/num-bigint", rev = "8bb5ee4" }     # branch: on-stack
 num-rational = { git = "https://github.com/openmina/num-rational", rev = "336f11d" } # branch: on-stack
 
 [profile.test.package."*"]

Cargo.toml

@@ -28,19 +28,22 @@ base64 = "0.22"
 bs58 = "0.4.0"
 thiserror = "1.0.37"
 
+graphannis-malloc_size_of = { workspace = true }
+graphannis-malloc_size_of_derive = { workspace = true }
+
 mina-hasher = { workspace = true }
 mina-p2p-messages = { workspace = true }
 poseidon = { workspace = true }
 hex = "0.4.3"
 ark-ff = { workspace = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-redux = { workspace = true, features=["serializable_callbacks"] }
+redux = { workspace = true, features = ["serializable_callbacks"] }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 wasm-bindgen = "0.2.99"
 wasm-bindgen-futures = "0.4.49"
-wasm_thread = { version = "0.3", features = [ "es_modules" ] }
+wasm_thread = { version = "0.3", features = ["es_modules"] }
 js-sys = "0.3"
 web-sys = { version = "0.3", features = ["Window", "Response"] }
 

core/Cargo.toml

@@ -1,3 +1,6 @@
+extern crate graphannis_malloc_size_of as malloc_size_of;
+extern crate graphannis_malloc_size_of_derive as malloc_size_of_derive;
+
 pub mod distributed_pool;
 pub mod invariants;
 pub mod log;

core/src/lib.rs

@@ -142,3 +142,15 @@ impl<T> Clone for RequestId<T> {
 }
 
 impl<T> Copy for RequestId<T> {}
+
+mod measurement {
+    use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
+
+    use super::RequestId;
+
+    impl<T> MallocSizeOf for RequestId<T> {
+        fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+            0
+        }
+    }
+}

core/src/requests/request_id.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use malloc_size_of::MallocSizeOf;
 use mina_p2p_messages::binprot::macros::{BinProtRead, BinProtWrite};
 use mina_p2p_messages::v2::{
     CurrencyFeeStableV1, MinaBaseFeeWithProverStableV1,
@@ -97,3 +98,10 @@ impl From<&Snark> for NetworkPoolSnarkPoolDiffVersionedStableV2AddSolvedWork1 {
         }
     }
 }
+
+impl MallocSizeOf for Snark {
+    fn size_of(&self, ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
+        usize::from(!ops.have_seen_ptr(Arc::as_ptr(&self.proofs)))
+            * (size_of::<TransactionSnarkWorkTStableV2Proofs>() + self.proofs.size_of(ops))
+    }
+}

core/src/snark/snark.rs

@@ -37,6 +37,9 @@ ark-ff = { workspace = true }
 rsexp = "0.2.3"
 rsexp-derive = "0.2.3"
 
+graphannis-malloc_size_of = { workspace = true }
+graphannis-malloc_size_of_derive = { workspace = true }
+
 [target.'cfg(fuzzing)'.dev-dependencies]
 fuzzcheck = "0.12.1"
 

mina-p2p-messages/Cargo.toml

@@ -1,6 +1,7 @@
 use std::ops::Deref;
 
 use binprot::{BinProtRead, BinProtWrite, Nat0};
+use malloc_size_of_derive::MallocSizeOf;
 use rsexp::OfSexp;
 use serde::{Deserialize, Serialize};
 
@@ -17,6 +18,7 @@ use serde::{Deserialize, Serialize};
     Deserialize,
     derive_more::From,
     derive_more::Into,
+    MallocSizeOf,
 )]
 pub struct ArrayN<T, const N: u64>(Vec<T>);
 

mina-p2p-messages/src/array.rs

@@ -7,6 +7,7 @@ use std::str::FromStr;
 use binprot::{BinProtRead, BinProtWrite};
 use binprot_derive::{BinProtRead, BinProtWrite};
 use derive_more::From;
+use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
 
 /// Before encoding, data is prepended with the version byte.
@@ -84,7 +85,7 @@ where
 
 /// Wrapper that uses base58check of binprot serialization for the wrapped type
 /// for human readable serializer.
-#[derive(PartialEq, Eq, PartialOrd, Ord)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, MallocSizeOf)]
 pub struct Base58CheckOfBinProt<T, U, const V: u8>(T, PhantomData<U>);
 
 impl<T, U, const V: u8> Default for Base58CheckOfBinProt<T, U, V>

mina-p2p-messages/src/b58.rs

@@ -1,4 +1,5 @@
 use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256};
+use malloc_size_of::MallocSizeOf;
 use rsexp::{OfSexp, SexpOf};
 use serde::{Deserialize, Serialize};
 
@@ -13,6 +14,12 @@ impl std::fmt::Debug for BigInt {
     }
 }
 
+impl MallocSizeOf for BigInt {
+    fn size_of(&self, _ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
+        0
+    }
+}
+
 #[derive(Debug, thiserror::Error)]
 #[error("Invalid decimal number")]
 pub struct InvalidDecimalNumber;