(feat/malloc_size_of): measure more

Author: vlad9486

mina-p2p-messages/src/rpc_kernel.rs

@@ -3,6 +3,7 @@ use std::io::Read;
 
 use binprot::{BinProtRead, BinProtWrite};
 use binprot_derive::{BinProtRead, BinProtWrite};
+use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
 
 use crate::versioned::Ver;
@@ -251,14 +252,18 @@ impl<T> From<DebuggerMessage<T>> for Message<T> {
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, BinProtRead, BinProtWrite, PartialEq, Eq)]
+#[derive(
+    Clone, Debug, Serialize, Deserialize, BinProtRead, BinProtWrite, PartialEq, Eq, MallocSizeOf,
+)]
 pub struct QueryHeader {
     pub tag: BinprotTag,
     pub version: Ver,
     pub id: QueryID,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, BinProtRead, BinProtWrite, PartialEq, Eq)]
+#[derive(
+    Clone, Debug, Serialize, Deserialize, BinProtRead, BinProtWrite, PartialEq, Eq, MallocSizeOf,
+)]
 pub struct ResponseHeader {
     pub id: QueryID,
 }

p2p/src/network/rpc/p2p_network_rpc_state.rs

@@ -20,14 +20,16 @@ use super::super::*;
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(10);
 
 #[serde_with::serde_as]
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, MallocSizeOf)]
 pub struct P2pNetworkRpcState {
     pub addr: ConnectionAddr,
     pub stream_id: StreamId,
     pub last_id: P2pRpcId,
+    #[ignore_malloc_size_of = "primitive"]
     pub last_heartbeat_sent: Option<redux::Timestamp>,
     pub pending: Option<QueryHeader>,
     #[serde_as(as = "Vec<(_, _)>")]
+    #[ignore_malloc_size_of = "TODO(vlad)"]
     pub total_stats: BTreeMap<(CharString, Ver), usize>,
     pub is_incoming: bool,
     pub buffer: Vec<u8>,
@@ -59,7 +61,7 @@ impl P2pNetworkRpcState {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, MallocSizeOf)]
 pub enum RpcMessage {
     Handshake,
     Heartbeat,
@@ -104,10 +106,14 @@ impl RpcMessage {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, thiserror::Error)]
+#[derive(Debug, Clone, Serialize, Deserialize, thiserror::Error, MallocSizeOf)]
 pub enum P2pNetworkRpcError {
     #[error("error reading binprot message: {0}")]
     Binprot(String),
     #[error("message {0} with size {1} exceeds limit of {2}")]
-    Limit(String, usize, Limit<usize>),
+    Limit(
+        String,
+        usize,
+        #[ignore_malloc_size_of = "primitive"] Limit<usize>,
+    ),
 }

p2p/src/network/scheduler/p2p_network_scheduler_state.rs

@@ -338,8 +338,8 @@ mod measurement {
                 + self.broadcast_state.size_of(ops)
                 + self.identify_state.size_of(ops)
                 + self.discovery_state.size_of(ops)
-
-            // TODO(vlad): `rpc_incoming_streams`, `rpc_outgoing_streams`
+                + self.rpc_incoming_streams.size_of(ops)
+                + self.rpc_outgoing_streams.size_of(ops)
         }
     }
 }

p2p/testing/src/libp2p_node.rs

@@ -78,7 +78,6 @@ pub struct Libp2pBehaviour {
     #[behaviour(ignore)]
     port: u16,
 
-    // TODO(vlad9486): move maps inside `RpcBehaviour`
     // map msg_id into (tag, version)
     #[behaviour(ignore)]
     pub ongoing: BTreeMap<(PeerId, u64), (RpcTag, u32)>,