aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authordergoegge <n.goeggi@gmail.com>2023-03-14 18:24:58 +0100
committerdergoegge <n.goeggi@gmail.com>2023-03-22 13:18:56 +0100
commit60441a3432df10f5d7c15c09c9569f27a793625b (patch)
treede78ca2032961f05050768bff2971e8ee8e57aff /src/net.cpp
parent6693c499f7d48aaa1f527a1a860b943fc8442241 (diff)
scripted-diff: [net] Rename CNode process queue members
-BEGIN VERIFY SCRIPT- ren() { sed -i "s:\<$1\>:$2:g" $(git grep -l "\<$1\>" ./src ./test); } ren cs_vProcessMsg m_msg_process_queue_mutex ren vProcessMsg m_msg_process_queue ren nProcessQueueSize m_msg_process_queue_size -END VERIFY SCRIPT-
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 80cccb1c74..384db5c014 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2797,7 +2797,7 @@ CNode::CNode(NodeId idIn,
void CNode::MarkReceivedMsgsForProcessing(unsigned int recv_flood_size)
{
- AssertLockNotHeld(cs_vProcessMsg);
+ AssertLockNotHeld(m_msg_process_queue_mutex);
size_t nSizeAdded = 0;
for (const auto& msg : vRecvMsg) {
@@ -2806,24 +2806,24 @@ void CNode::MarkReceivedMsgsForProcessing(unsigned int recv_flood_size)
nSizeAdded += msg.m_raw_message_size;
}
- LOCK(cs_vProcessMsg);
- vProcessMsg.splice(vProcessMsg.end(), vRecvMsg);
- nProcessQueueSize += nSizeAdded;
- fPauseRecv = nProcessQueueSize > recv_flood_size;
+ LOCK(m_msg_process_queue_mutex);
+ m_msg_process_queue.splice(m_msg_process_queue.end(), vRecvMsg);
+ m_msg_process_queue_size += nSizeAdded;
+ fPauseRecv = m_msg_process_queue_size > recv_flood_size;
}
std::optional<std::pair<CNetMessage, bool>> CNode::PollMessage(size_t recv_flood_size)
{
- LOCK(cs_vProcessMsg);
- if (vProcessMsg.empty()) return std::nullopt;
+ LOCK(m_msg_process_queue_mutex);
+ if (m_msg_process_queue.empty()) return std::nullopt;
std::list<CNetMessage> msgs;
// Just take one message
- msgs.splice(msgs.begin(), vProcessMsg, vProcessMsg.begin());
- nProcessQueueSize -= msgs.front().m_raw_message_size;
- fPauseRecv = nProcessQueueSize > recv_flood_size;
+ msgs.splice(msgs.begin(), m_msg_process_queue, m_msg_process_queue.begin());
+ m_msg_process_queue_size -= msgs.front().m_raw_message_size;
+ fPauseRecv = m_msg_process_queue_size > recv_flood_size;
- return std::make_pair(std::move(msgs.front()), !vProcessMsg.empty());
+ return std::make_pair(std::move(msgs.front()), !m_msg_process_queue.empty());
}
bool CConnman::NodeFullyConnected(const CNode* pnode)