merge bitcoin#26888: simplify the call to vProcessMsg.splice()

kwvg · kwvg · commit d3f5b3881b80 · 2024-09-12T14:42:57.000Z
diff --git a/src/net.cpp b/src/net.cpp
@@ -2097,15 +2097,14 @@ size_t CConnman::SocketRecvData(CNode *pnode)
         RecordBytesRecv(nBytes);
         if (notify) {
             size_t nSizeAdded = 0;
-            auto it(pnode->vRecvMsg.begin());
-            for (; it != pnode->vRecvMsg.end(); ++it) {
+            for (const auto& msg : pnode->vRecvMsg) {
                 // vRecvMsg contains only completed CNetMessage
                 // the single possible partially deserialized message are held by TransportDeserializer
-                nSizeAdded += it->m_raw_message_size;
+                nSizeAdded += msg.m_raw_message_size;
             }
             {
                 LOCK(pnode->cs_vProcessMsg);
-                pnode->vProcessMsg.splice(pnode->vProcessMsg.end(), pnode->vRecvMsg, pnode->vRecvMsg.begin(), it);
+                pnode->vProcessMsg.splice(pnode->vProcessMsg.end(), pnode->vRecvMsg);
                 pnode->nProcessQueueSize += nSizeAdded;
                 pnode->fPauseRecv = pnode->nProcessQueueSize > nReceiveFloodSize;
             }
diff --git a/src/test/util/net.cpp b/src/test/util/net.cpp
@@ -69,15 +69,14 @@ void ConnmanTestMsg::NodeReceiveMsgBytes(CNode& node, Span<const uint8_t> msg_by
     assert(node.ReceiveMsgBytes(msg_bytes, complete));
     if (complete) {
         size_t nSizeAdded = 0;
-        auto it(node.vRecvMsg.begin());
-        for (; it != node.vRecvMsg.end(); ++it) {
+        for (const auto& msg : node.vRecvMsg) {
             // vRecvMsg contains only completed CNetMessage
             // the single possible partially deserialized message are held by TransportDeserializer
-            nSizeAdded += it->m_raw_message_size;
+            nSizeAdded += msg.m_raw_message_size;
         }
         {
             LOCK(node.cs_vProcessMsg);
-            node.vProcessMsg.splice(node.vProcessMsg.end(), node.vRecvMsg, node.vRecvMsg.begin(), it);
+            node.vProcessMsg.splice(node.vProcessMsg.end(), node.vRecvMsg);
             node.nProcessQueueSize += nSizeAdded;
             node.fPauseRecv = node.nProcessQueueSize > nReceiveFloodSize;
         }

Original file line number	Diff line number	Diff line change
`@@ -2097,15 +2097,14 @@ size_t CConnman::SocketRecvData(CNode *pnode)`
`2097`	`2097`	`RecordBytesRecv(nBytes);`
`2098`	`2098`	`if (notify) {`
`2099`	`2099`	`size_t nSizeAdded = 0;`
`2100`		`- auto it(pnode->vRecvMsg.begin());`
`2101`		`- for (; it != pnode->vRecvMsg.end(); ++it) {`
	`2100`	`+ for (const auto& msg : pnode->vRecvMsg) {`
`2102`	`2101`	`// vRecvMsg contains only completed CNetMessage`
`2103`	`2102`	`// the single possible partially deserialized message are held by TransportDeserializer`
`2104`		`- nSizeAdded += it->m_raw_message_size;`
	`2103`	`+ nSizeAdded += msg.m_raw_message_size;`
`2105`	`2104`	`}`
`2106`	`2105`	`{`
`2107`	`2106`	`LOCK(pnode->cs_vProcessMsg);`
`2108`		`- pnode->vProcessMsg.splice(pnode->vProcessMsg.end(), pnode->vRecvMsg, pnode->vRecvMsg.begin(), it);`
	`2107`	`+ pnode->vProcessMsg.splice(pnode->vProcessMsg.end(), pnode->vRecvMsg);`
`2109`	`2108`	`pnode->nProcessQueueSize += nSizeAdded;`
`2110`	`2109`	`pnode->fPauseRecv = pnode->nProcessQueueSize > nReceiveFloodSize;`
`2111`	`2110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,15 +69,14 @@ void ConnmanTestMsg::NodeReceiveMsgBytes(CNode& node, Span<const uint8_t> msg_by`
`69`	`69`	`assert(node.ReceiveMsgBytes(msg_bytes, complete));`
`70`	`70`	`if (complete) {`
`71`	`71`	`size_t nSizeAdded = 0;`
`72`		`- auto it(node.vRecvMsg.begin());`
`73`		`- for (; it != node.vRecvMsg.end(); ++it) {`
	`72`	`+ for (const auto& msg : node.vRecvMsg) {`
`74`	`73`	`// vRecvMsg contains only completed CNetMessage`
`75`	`74`	`// the single possible partially deserialized message are held by TransportDeserializer`
`76`		`- nSizeAdded += it->m_raw_message_size;`
	`75`	`+ nSizeAdded += msg.m_raw_message_size;`
`77`	`76`	`}`
`78`	`77`	`{`
`79`	`78`	`LOCK(node.cs_vProcessMsg);`
`80`		`- node.vProcessMsg.splice(node.vProcessMsg.end(), node.vRecvMsg, node.vRecvMsg.begin(), it);`
	`79`	`+ node.vProcessMsg.splice(node.vProcessMsg.end(), node.vRecvMsg);`
`81`	`80`	`node.nProcessQueueSize += nSizeAdded;`
`82`	`81`	`node.fPauseRecv = node.nProcessQueueSize > nReceiveFloodSize;`
`83`	`82`	`}`