net: Use DynamicUsage(m_type) in CSerializedNetMsg::GetMemoryUsage

laanwj · laanwj · commit c3a6722f34a5 · 2024-11-04T18:46:40.000+01:00
Now that memusage correctly computes the dynamic size of a string, there
is no need for special handling here.
diff --git a/src/net.cpp b/src/net.cpp
@@ -121,10 +121,7 @@ std::string strSubVersion;
 
 size_t CSerializedNetMsg::GetMemoryUsage() const noexcept
 {
-    // Don't count the dynamic memory used for the m_type string, by assuming it fits in the
-    // "small string" optimization area (which stores data inside the object itself, up to some
-    // size; 15 bytes in modern libstdc++).
-    return sizeof(*this) + memusage::DynamicUsage(data);
+    return sizeof(*this) + memusage::DynamicUsage(m_type) + memusage::DynamicUsage(data);
 }
 
 void CConnman::AddAddrFetch(const std::string& strDest)

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,7 @@ std::string strSubVersion;`
`121`	`121`
`122`	`122`	`size_t CSerializedNetMsg::GetMemoryUsage() const noexcept`
`123`	`123`	`{`
`124`		`- // Don't count the dynamic memory used for the m_type string, by assuming it fits in the`
`125`		`- // "small string" optimization area (which stores data inside the object itself, up to some`
`126`		`- // size; 15 bytes in modern libstdc++).`
`127`		`- return sizeof(*this) + memusage::DynamicUsage(data);`
	`124`	`+ return sizeof(*this) + memusage::DynamicUsage(m_type) + memusage::DynamicUsage(data);`
`128`	`125`	`}`
`129`	`126`
`130`	`127`	`void CConnman::AddAddrFetch(const std::string& strDest)`