net: handle message accounting in ReceiveMsgBytes

theuni · Fuzzbawls · commit ffd4859d295e · 2020-09-02T00:41:59.000-07:00
This allows locking to be pushed down to only where it's needed

Also reuse the current time rather than checking multiple times.
diff --git a/src/net.cpp b/src/net.cpp
@@ -708,6 +708,9 @@ void CNode::copyStats(CNodeStats& stats)
 bool CNode::ReceiveMsgBytes(const char* pch, unsigned int nBytes, bool& complete)
 {
     complete = false;
+    int64_t nTimeMicros = GetTimeMicros();
+    nLastRecv = nTimeMicros / 1000000;
+    nRecvBytes += nBytes;
     while (nBytes > 0) {
         // get current incomplete message, or create a new one
         if (vRecvMsg.empty() ||
@@ -744,7 +747,7 @@ bool CNode::ReceiveMsgBytes(const char* pch, unsigned int nBytes, bool& complete
             assert(i != mapRecvBytesPerMsgCmd.end());
             i->second += msg.hdr.nMessageSize + CMessageHeader::HEADER_SIZE;
 
-            msg.nTime = GetTimeMicros();
+            msg.nTime = nTimeMicros;
             complete = true;
         }
     }
@@ -1242,8 +1245,6 @@ void CConnman::ThreadSocketHandler()
                                 pnode->CloseSocketDisconnect();
                             if(notify)
                                 condMsgProc.notify_one();
-                            pnode->nLastRecv = GetTime();
-                            pnode->nRecvBytes += nBytes;
                             RecordBytesRecv(nBytes);
                         } else if (nBytes == 0) {
                             // socket closed gracefully
