aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-12-31 02:05:28 -0500
committerCory Fields <cory-nospam-@coryfields.com>2017-01-12 23:05:25 -0500
commit4d712e366ca7fffaf96394ef01c9246482c0d92e (patch)
treeaa61383f6bf692c4fda2f697ad6fba3e4c199913 /src/net.cpp
parentc5a8b1b946b1ab0bb82bd4270b2a40f5731abcff (diff)
downloadbitcoin-4d712e366ca7fffaf96394ef01c9246482c0d92e.tar.xz
net: add a new message queue for the message processor
This separates the storage of messages from the net and queued messages for processing, allowing the locks to be split.
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 947f016798..df2109e3f7 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1239,8 +1239,18 @@ void CConnman::ThreadSocketHandler()
if (!pnode->ReceiveMsgBytes(pchBuf, nBytes, notify))
pnode->CloseSocketDisconnect();
RecordBytesRecv(nBytes);
- if (notify)
+ if (notify) {
+ auto it(pnode->vRecvMsg.begin());
+ for (; it != pnode->vRecvMsg.end(); ++it) {
+ if (!it->complete())
+ break;
+ }
+ {
+ LOCK(pnode->cs_vProcessMsg);
+ pnode->vProcessMsg.splice(pnode->vProcessMsg.end(), pnode->vRecvMsg, pnode->vRecvMsg.begin(), it);
+ }
WakeMessageHandler();
+ }
}
else if (nBytes == 0)
{